Fix Berkshelf integration #74

sethvargo · 2013-06-10T21:23:52Z

Fixes knife spork promote with Berksfile #73

- Fixes #73

sethvargo · 2013-06-10T21:24:40Z

I lied - I think this might fix #73, but I don't have a reliable test case. Can someone point their Gemfile at this and try it:

gem 'knife-spork', github: 'sethvargo/knife-spork', branch: 'promote_berksfie'

bobziuchkovski · 2013-06-10T21:49:28Z

This is still broken, but works after patching runner.rb:104 (pass cookbook_name) and runner.rb:128 (cookbook_name as param):

cookbook = load_from_chef(cookbook_name) || load_from_berkshelf(cookbook_name) || load_from_librarian(cookbook_name)

and

def load_from_librarian(name)

sethvargo · 2013-06-10T21:50:48Z

@ziuchkovski yea... that would definitely be a bug. Updated

bobziuchkovski · 2013-06-10T21:55:47Z

Confirmed, your 4e15d59 commit works as expected. Thanks!

scalp42 · 2013-06-13T07:52:47Z

@ziuchkovski you think you could provide me some feedback. I must be doing something wrong but I can't get it to work

cc @sethvargo

#73

jonlives · 2013-06-26T10:35:20Z

@sethvargo what's the status on this one? Looks like @scalp42 is still having issues per #73

sethvargo · 2013-06-26T14:54:56Z

@jonlives I'm not sure. For some reason, the berksfile arg is just coming in as a boolean instead of the stringed value. I have no idea why.

jonlives · 2013-06-26T15:18:23Z

Huh. will keep this one open then!

sethvargo · 2013-06-26T15:20:46Z

yea. I haven't had time to dig into it yet

RSO · 2013-07-12T16:42:05Z

I am not quite sure if this is the correct place to post this, since I encounter errors in both the master branch as in your promote_berksfile branch. In your branch, when I run:

bundle exec knife spork promote debug bla-cookbook --remote -VV

I get:

DEBUG: No chefignore file found at ~/Projects/factlink/chef-repo/cookbooks/chefignore no files will be ignored
DEBUG: No chefignore file found at ~/Projects/factlink/chef-repo/site-cookbooks/chefignore no files will be ignored
~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/plugins/git.rb:30:in `block in before_promote': undefined method `root_dir' for #<Berkshelf::CachedCookbook:0x007f942e4a4fb0> (NoMethodError)
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/plugins/git.rb:29:in `each'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/plugins/git.rb:29:in `before_promote'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/plugins.rb:11:in `block in run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/plugins.rb:9:in `each'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/plugins.rb:9:in `run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/runner.rb:32:in `run_plugins'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/chef/knife/spork-promote.rb:46:in `run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/lib/chef/knife.rb:460:in `run_with_pretty_exceptions'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/lib/chef/knife.rb:173:in `run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/lib/chef/application/knife.rb:123:in `run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/bin/knife:25:in `<top (required)>'
  from ~/.rbenv/versions/1.9.3-p327/bin/knife:23:in `load'
  from ~/.rbenv/versions/1.9.3-p327/bin/knife:23:in `<main>'

Any idea what's going wrong here? As you can see I do not use the -b Berksfile option, since the Berksfile is in my working directory. When I use:

bundle exec knife spork promote debug bla-cookbook --remote -VV -b Berksfile

I get:

~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/lib/chef/cookbook_loader.rb:103:in `[]': undefined method `to_sym' for nil:NilClass (NoMethodError)
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/runner.rb:111:in `load_from_chef'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/knife-spork/runner.rb:104:in `load_cookbook'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/chef/knife/spork-promote.rb:157:in `check_cookbook_uploaded'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/bundler/gems/knife-spork-4e15d592d100/lib/chef/knife/spork-promote.rb:51:in `run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/lib/chef/knife.rb:460:in `run_with_pretty_exceptions'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/lib/chef/knife.rb:173:in `run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/lib/chef/application/knife.rb:123:in `run'
  from ~/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/chef-11.4.4/bin/knife:25:in `<top (required)>'
  from ~/.rbenv/versions/1.9.3-p327/bin/knife:23:in `load'
  from ~/.rbenv/versions/1.9.3-p327/bin/knife:23:in `<main>'

I hope this helps you with finding a fix for this. I have no time left, but will see if I can put some more effort in finding this bug this weekend.

RSO · 2013-07-15T08:58:02Z

I found out that the bugs I encountered were caused by the git plugin. Disabling this plugin solved the problem for me. It would be nice to fix the git plugin before merging this.

I needed to promote a cookbook that was not part of the immediate Berksfile, but was in the Berksfile.lock as it was a dependency of a cookbook.

RSO · 2013-07-18T12:02:36Z

I added a pull request to this branch on sethvargo/knife-spork#1 which resolves the cookbooks from the Berksfile.lock instead of the Berksfile

@sethvargo

@sethvargo should we keep track somewhere that this can be solved differently in master?

Allow loading cookbooks from the Berksfile.lock file

sethvargo · 2013-07-18T17:35:12Z

@jonlives could you take a peek at this please?

jonlives · 2013-07-19T10:45:42Z

Awesome, will try and get this out for y'all early next week :)

jonlives · 2013-07-22T08:45:26Z

@RSO, @sethvargo could one of you please write a quick comment with what this has changed in the way Berkshelf is used? I don't use berkshelf locally to test - I assume this has now resolved the original issues?

RSO · 2013-07-22T10:09:21Z

This PR added support for Berkshelf in knife-spork promote. What this means is that when a cookbook is not found locally, knife-spork will check if the file can be found in the Berksfile.lock file. I think it might be best to add some text to the README, since there are some gotcha's, for instance: the git option in knife-spork config isn't supported.

I could see if I can find some time this week to update this PR, or maybe create another one for the git issue.

jonlives · 2013-07-22T10:17:22Z

Thanks @RSO :) If you have a mo to look at the git issue, that would be awesome :)

jonlives · 2013-08-01T15:18:35Z

@sethvargo, @RSO it looks like the issues with the git plugin lie in the Berkshelf::CachedCookbook object not having a root_dir method.

There are a couple of ways we could tackle this.

Don't try to git pull for objects of that type
Fix the logic to work with objects of that type.
Something else

Do either of you have any thoughts on this? I'm not a Berkshelf user so I'm hesitant to decree the fix :p

sethvargo · 2013-08-01T18:39:58Z

@jonlives there should be methods on CachedCookbook to do what you need. What exactly are you trying to do?

jonlives · 2013-08-01T18:45:33Z

This part of the plugin starts with the root_dir of the cookbook object and figures out if it's a subdir of a git repo. If it is, it traverses the FS tree to find the repo root, and runs a git pull there. Same for if it's a submodule. For CachedCookbook, I basically need a method for determining where the cookbook lives :)

sethvargo · 2013-08-01T18:56:03Z

Does .path or .cookbook_path not work?

jonlives · 2013-08-01T19:01:12Z

I haven't got berkshelf set up locally yet to test with - gives me a place to start looking though :)

RSO · 2013-08-05T11:44:20Z

I tried changing the root_dir to both cookbook_path and path, and this is what I got:

$ knife spork promote ENVIRONMENT COOKBOOK --remote -VV
Called 'load_file' without the :safe option -- defaulting to safe mode.
/Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins/git.rb:30:in `block in before_promote': undefined method `cookbook_path' for #<Berkshelf::CachedCookbook:0x007fef7aff3130> (NoMethodError)
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins/git.rb:29:in `each'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins/git.rb:29:in `before_promote'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins.rb:11:in `block in run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins.rb:9:in `each'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins.rb:9:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/runner.rb:32:in `run_plugins'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/chef/knife/spork-promote.rb:46:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/lib/chef/knife.rb:460:in `run_with_pretty_exceptions'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/lib/chef/knife.rb:173:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/lib/chef/application/knife.rb:123:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/bin/knife:25:in `<top (required)>'
    from /Users/remon/.rbenv/versions/2.0.0-p247/bin/knife:23:in `load'
    from /Users/remon/.rbenv/versions/2.0.0-p247/bin/knife:23:in `<main>'

And:

$ knife spork promote ENVIRONMENT COOKBOOK --remote -VV
Called 'load_file' without the :safe option -- defaulting to safe mode.
DEBUG: No chefignore file found at /var/chef/cookbooks/chefignore no files will be ignored
DEBUG: No chefignore file found at /var/chef/site-cookbooks/chefignore no files will be ignored
/Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins/git.rb:30:in `block in before_promote': undefined method `include?' for #<Pathname:0x007fa735923130> (NoMethodError)
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins/git.rb:29:in `each'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins/git.rb:29:in `before_promote'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins.rb:11:in `block in run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins.rb:9:in `each'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/plugins.rb:9:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/knife-spork/runner.rb:32:in `run_plugins'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/bundler/gems/knife-spork-be417242c929/lib/chef/knife/spork-promote.rb:46:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/lib/chef/knife.rb:460:in `run_with_pretty_exceptions'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/lib/chef/knife.rb:173:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/lib/chef/application/knife.rb:123:in `run'
    from /Users/remon/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/chef-11.4.4/bin/knife:25:in `<top (required)>'
    from /Users/remon/.rbenv/versions/2.0.0-p247/bin/knife:23:in `load'
    from /Users/remon/.rbenv/versions/2.0.0-p247/bin/knife:23:in `<main>'

jonlives · 2013-08-06T10:30:41Z

@RSO that looks like"path" will work then, but it's returning you a Pathname object, which doesn't have an include? method.

I think what would work here is testing if the cookbook is a Berkshelf::CachedCookbook, and if it is then using cookbook.path.to_s. Converting it back to a string will allow us to use the include? method as normal. You able to have a look at this? If not, I can try and get Berkshelf set up locally to do some messing around.

RSO · 2013-08-06T10:54:04Z

I'm on it

jonlives · 2013-08-06T10:55:13Z

Awesome thanks :)

RSO · 2013-08-06T11:28:42Z

Commit submitted in sethvargo/knife-spork#2

jonlives · 2013-08-06T11:33:48Z

Thanks @RSO - @sethvargo, if you could merge this into your branch and update this PR please, I'll get this tested at my end and into the new version.

Use cookbook.path.to_s when the cookbook is a CachedCookbook

sethvargo · 2013-08-06T12:25:24Z

@jonlives done

jonlives · 2013-08-06T12:32:05Z

Lovely stuff, thanks!

jonlives · 2013-08-06T12:34:28Z

@sethvargo does this fix the original #73 referenced in this ticket? It fixes the git plugin issues, but do we still have the issue with the Berksfile coming in as a boolean?

RSO · 2013-08-06T12:37:40Z

Ah damn, forgot about that one, I tried and #73 still bugs. Will look in to that

jonlives · 2013-08-06T12:39:07Z

@RSO thanks, would be awesome if we can FIX ALL THE THINGS :p

RSO · 2013-08-06T12:49:58Z

Fixed in sethvargo/knife-spork#3

This commit fixes #73

sethvargo · 2013-08-06T12:50:50Z

@RSO merged

jonlives · 2013-08-06T12:56:41Z

You two are awesome! Thanks - will get this merged into the new release branch. Watch this space for 1.3.0 :p

Fix Berkshelf integration

jonlives · 2013-10-23T09:53:35Z

knife-spork-1.3.0 released, containing this feature :)

Fix Berkshelf integration

afa51e8

- Fixes #73

sethvargo mentioned this pull request Jun 10, 2013

knife spork promote with Berksfile #73

Closed

Whoops, passing parameters is good

4e15d59

Allow loading cookbooks from the Berksfile.lock file

38a2981

I needed to promote a cookbook that was not part of the immediate Berksfile, but was in the Berksfile.lock as it was a dependency of a cookbook.

RSO and others added 2 commits July 18, 2013 18:57

Raise error when no lockfile is found

9fae060

@sethvargo should we keep track somewhere that this can be solved differently in master?

Merge pull request #1 from RSO/patch-1

be41724

Allow loading cookbooks from the Berksfile.lock file

Use cookbook.path.to_s when the cookbook is a CachedCookbook

773bdc3

Merge pull request #2 from RSO/patch-1

fe56e62

Use cookbook.path.to_s when the cookbook is a CachedCookbook

Fixed -b option definition, which fixes #73

42bc750

Merge pull request #3 from RSO/fix_berkshelf_option

6abdc33

This commit fixes #73

jonlives added a commit that referenced this pull request Aug 6, 2013

Merge pull request #74 from sethvargo/promote_berksfile

e964f76

Fix Berkshelf integration

jonlives merged commit e964f76 into jonlives:master Aug 6, 2013

RSO mentioned this pull request Aug 7, 2013

Berkshelf integration (yes, again) #85

Closed

Fix Berkshelf integration #74

Fix Berkshelf integration #74

Conversation

sethvargo commented Jun 10, 2013

sethvargo commented Jun 10, 2013

bobziuchkovski commented Jun 10, 2013

sethvargo commented Jun 10, 2013

bobziuchkovski commented Jun 10, 2013

scalp42 commented Jun 13, 2013

jonlives commented Jun 26, 2013

sethvargo commented Jun 26, 2013

jonlives commented Jun 26, 2013

sethvargo commented Jun 26, 2013

RSO commented Jul 12, 2013

RSO commented Jul 15, 2013

RSO commented Jul 18, 2013

sethvargo commented Jul 18, 2013

jonlives commented Jul 19, 2013

jonlives commented Jul 22, 2013

RSO commented Jul 22, 2013

jonlives commented Jul 22, 2013

jonlives commented Aug 1, 2013

sethvargo commented Aug 1, 2013

jonlives commented Aug 1, 2013

sethvargo commented Aug 1, 2013

jonlives commented Aug 1, 2013

RSO commented Aug 5, 2013

jonlives commented Aug 6, 2013

RSO commented Aug 6, 2013

jonlives commented Aug 6, 2013

RSO commented Aug 6, 2013

jonlives commented Aug 6, 2013

sethvargo commented Aug 6, 2013

jonlives commented Aug 6, 2013

jonlives commented Aug 6, 2013

RSO commented Aug 6, 2013

jonlives commented Aug 6, 2013

RSO commented Aug 6, 2013

sethvargo commented Aug 6, 2013

jonlives commented Aug 6, 2013

jonlives commented Oct 23, 2013