knife-spork 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.2 (10th Sept, 2013)
+
+Bugfixes:
+
+    - Fix bug with promoting when environment groups are present (thanks to Jimmy Chao & Nik Keating - https://github.com/CaseCommonsDevOps)
+
 ## 1.2.1 (28th June, 2013)
 
 Bugfixes:

data/knife-spork.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'knife-spork'
-  gem.version       = '1.2.1'
+  gem.version       = '1.2.2'
   gem.authors       = ["Jon Cowie"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/jonlives/knife-spork'

data/lib/chef/knife/spork-promote.rb

@@ -26,7 +26,7 @@ module KnifeSpork
     if defined?(::Berkshelf)
       option :berksfile,
         :short => '-b',
-        :long => 'berksfile',
+        :long => '--berksfile BERKSFILE',
         :description => 'Path to a Berksfile to operate off of',
         :default => File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME)
     end

data/lib/knife-spork/plugins/git.rb

@@ -11,8 +11,8 @@ module KnifeSpork
         git_pull(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
         git_pull_submodules(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
         cookbooks.each do |cookbook|
-          git_pull(cookbook.root_dir)
-          git_pull_submodules(cookbook.root_dir)
+          git_pull(cookbook_path_for(cookbook))
+          git_pull_submodules(cookbook_path_for(cookbook))
         end
       end
 
@@ -20,23 +20,23 @@ module KnifeSpork
         git_pull(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
         git_pull_submodules(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
         cookbooks.each do |cookbook|
-          git_pull(cookbook.root_dir)
-          git_pull_submodules(cookbook.root_dir)
+          git_pull(cookbook_path_for(cookbook))
+          git_pull_submodules(cookbook_path_for(cookbook))
         end
       end
 
       def before_promote
         cookbooks.each do |cookbook|
-          git_pull(environment_path) unless cookbook.root_dir.include?(environment_path.gsub"/environments","")
-          git_pull_submodules(environment_path) unless cookbook.root_dir.include?(environment_path.gsub"/environments","")
-          git_pull(cookbook.root_dir)
-          git_pull_submodules(cookbook.root_dir)
+          git_pull(environment_path) unless cookbook_path_for(cookbook).include?(environment_path.gsub"/environments","")
+          git_pull_submodules(environment_path) unless cookbook_path_for(cookbook).include?(environment_path.gsub"/environments","")
+          git_pull(cookbook_path_for(cookbook))
+          git_pull_submodules(cookbook_path_for(cookbook))
         end
       end
 
       def after_bump
         cookbooks.each do |cookbook|
-          git_add(cookbook.root_dir,"metadata.rb")
+          git_add(cookbook_path_for(cookbook),"metadata.rb")
         end
       end
 
@@ -92,7 +92,7 @@ module KnifeSpork
           end
         end
       end
-      
+
       def git_add(filepath,filename)
         if is_repo?(filepath)
           ui.msg "Git add'ing #{filepath}/#{filename}"
@@ -105,7 +105,7 @@ module KnifeSpork
           end
         end
       end
-      
+
       # Commit changes, if any
       def git_commit
         begin
@@ -184,6 +184,14 @@ module KnifeSpork
       def tag_name
         cookbooks.collect{|c| "#{c.name}@#{c.version}"}.join('-')
       end
+
+      def cookbook_path_for cookbook
+        if defined?(Berkshelf) and cookbook.is_a? Berkshelf::CachedCookbook
+          cookbook.path.to_s
+        else
+          cookbook.root_dir
+        end
+      end
     end
   end
 end

data/lib/knife-spork/runner.rb

@@ -53,10 +53,10 @@ module KnifeSpork
       end
 
       def load_specified_environment_group(name)
-        if spork_config.environment_groups.nil?
-          [name]
-        else
+        if !spork_config.environment_groups.nil? && spork_config.environment_groups.keys.include?(name)
           spork_config.environment_groups[name]
+        else
+          [name]
         end
       end
 
@@ -107,26 +107,40 @@ module KnifeSpork
         ::Chef::CookbookLoader.new(::Chef::Config.cookbook_path)
       end
 
-      def load_cookbook(cookbook_name)
-        return cookbook_name if cookbook_name.is_a?(::Chef::CookbookVersion)
+      def load_cookbook(name)
+        return name if name.is_a?(Chef::CookbookVersion)
 
-        # Search the local chef repo first
-        loader = ::Chef::CookbookLoader.new(Chef::Config.cookbook_path)
-        if loader.has_key?(cookbook_name)
-          return loader[cookbook_name]
-        end
+        cookbook = load_from_chef(name) || load_from_berkshelf(name) || load_from_librarian(name)
 
-        # We didn't find the cookbook in our local repo, so check Berkshelf
-        if defined?(::Berkshelf)
-          berksfile = ::Berkshelf::Berksfile.from_file(self.config[:berksfile])
-          if cookbook = berksfile.sources.find{ |source| source.name == cookbook_name }
-            return cookbook
-          end
-        end
+        cookbook || raise(Chef::Exceptions::CookbookNotFound,
+          "Could not find cookbook '#{name}' in any of the sources!")
+      end
+
+      def load_from_chef(name)
+        all_cookbooks[name]
+      rescue Chef::Exceptions::CookbookNotFound,
+             Chef::Exceptions::CookbookNotFoundInRepo
+        nil
+      end
+
+      def load_from_berkshelf(name)
+        return unless defined?(::Berkshelf)
+        berksfile = ::Berkshelf::Berksfile.from_file(self.config[:berksfile])
+        lockfile = ::Berkshelf::Lockfile.new(berksfile)
+
+        raise Berkshelf::BerkshelfError, "LockFileNotFound" unless File.exists?(lockfile.filepath)
 
-        # TODO: add librarian support here
+        cookbook = Berkshelf.ui.mute {
+          berksfile.resolve(lockfile.find(name))[:solution].first
+        }
 
-        raise ::Chef::Exceptions::CookbookNotFound, "Could not find cookbook '#{cookbook_name}' in any of the sources!"
+        cookbook
+      end
+
+      # @todo #opensource
+      def load_from_librarian(name)
+        # Your code here :)
+        nil
       end
 
       def load_cookbooks(cookbook_names)
@@ -150,7 +164,16 @@ module KnifeSpork
       def environment_diff(local_environment, remote_environment)
         local_environment_versions = local_environment.to_hash['cookbook_versions']
         remote_environment_versions = remote_environment.to_hash['cookbook_versions']
-        remote_environment_versions.diff(local_environment_versions)
+        hash_diff remote_environment_versions, local_environment_versions
+      end
+
+      def hash_diff(hash, other)
+        hash.keys.inject({}) do |memo, key|
+          unless hash[key] == other[key]
+            memo[key] = "#{hash[key]} changed to #{other[key]}"
+          end
+          memo
+        end
       end
 
       def constraints_diff (environment_diff)
@@ -189,15 +212,3 @@ module KnifeSpork
     end
   end
 end
-
-
-class Hash
-  def diff(other)
-    self.keys.inject({}) do |memo, key|
-      unless self[key] == other[key]
-        memo[key] = "#{self[key]} changed to #{other[key]}"
-      end
-      memo
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef