knife-spork 0.1.4 → 0.1.6

data/knife-spork.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'knife-spork'
-  s.version           = '0.1.4'
-  s.date              = '2012-02-03'
+  s.version           = '0.1.6'
+  s.date              = '2012-02-21'
   s.rubyforge_project = 'knife-spork'
 
   ## Make sure your summary is short. The description may be as long

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

@@ -70,12 +70,14 @@ module KnifeSpork
         bump_type = name_args[1]
       elsif name_args.size == 2
         bump_type = name_args.last
+      elsif name_args.size == 1
+        bump_type = "patch"
       else
         ui.fatal "Please specify the cookbook whose version you which to bump, and the type of bump you wish to apply."
         show_usage
         exit 1
       end
-
+      
       unless TYPE_INDEX.has_key?(bump_type)
         ui.fatal "Sorry, '#{name_args.last}' isn't a valid bump type.  Specify one of 'major', 'minor', 'patch' or 'manual'"
         show_usage
@@ -86,13 +88,11 @@ module KnifeSpork
         manual_version = name_args.last
         cookbook = name_args.first
         cookbook_path = Array(config[:cookbook_path]).first
-        patch_type = "manual"
         patch_manual(cookbook_path, cookbook, manual_version)
       else
           cookbook = name_args.first
-          patch_type = name_args.last
           cookbook_path = Array(config[:cookbook_path]).first
-          patch(cookbook_path, cookbook, patch_type)
+          patch(cookbook_path, cookbook, bump_type)
       end
 
       if !AppConf.git.nil? && AppConf.git.enabled
@@ -170,7 +170,7 @@ module KnifeSpork
         rescue ArgumentError => e
           ui.warn "Git: The root of your chef repo doesn't look like it's a git repo. Skipping git add...\n\n"
         rescue
-          ui.warn "Git: Cookbook uploaded, but something went wrong with git add metadata.rb, Dumping log info..."
+          ui.warn "Git: Cookbook bump succeeded, but something went wrong with git add metadata.rb, so you'll want to manually git add it. Dumping log info..."
           ui.warn "#{strio.string}"
         end
       end

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

@@ -120,7 +120,15 @@ module KnifeSpork
         environments.each do |e|
               ui.msg ""
               ui.msg "Environment: #{e}"
-              @environment = loader.load_from("environments", "#{e}.json")
+              
+              
+              cookbook_path = config[:cookbook_path]
+              if cookbook_path.size > 1
+                @environment = loader.load_from("environments", "#{e}.json")
+              else
+                path = cookbook_path[0].gsub("cookbooks","environments") + "/#{e}.json"
+                 @environment = loader.object_from_file("#{path}")
+              end
 
               if @cookbook == "all"
                 ui.msg "Promoting ALL cookbooks to environment #{@environment}"
@@ -195,7 +203,12 @@ module KnifeSpork
           env_server = Chef::Environment.load(environment.gsub(".json","")).to_hash["cookbook_versions"]
           env_local = updated.to_hash["cookbook_versions"]
           env_diff = env_server.diff(env_local)
-            
+          
+          if env_diff.size > 1
+            ui.warn "You're about to promote changes to several cookbooks:"
+            ui.warn "\n#{env_diff.collect { |k, v| "#{k}: #{v}\n" }.join}"
+            ui.confirm("Are you sure you want to continue?")
+          end
           updated.save
 
           if !AppConf.gist.nil? && AppConf.gist.enabled
@@ -209,21 +222,39 @@ module KnifeSpork
             @gist = %x[ echo "#{msg}" | #{gist_path}]
           end
           
-          if !AppConf.irccat.nil? && AppConf.irccat.enabled
-            message = "#{AppConf.irccat.channel} CHEF: #{ENV['USER']} uploaded environment #{environment.gsub(".json","")} #{@gist}"
-            s = TCPSocket.open(AppConf.irccat.server,AppConf.irccat.port)
-            s.write(message)
-            s.close
+          if !AppConf.irccat.nil? && AppConf.irccat.enabled   
+            begin
+              
+              if !AppConf.irccat.channel?(String)
+                channels = AppConf.irccat.channel
+              else
+                channels = ["#{AppConf.irccat.channel}"]
+              end
+              
+              channels.each do |c|   
+                message = "#{c} #BOLD#PURPLECHEF:#NORMAL #{ENV['USER']} uploaded environment #TEAL#{environment.gsub(".json","")}#NORMAL #{@gist}"
+                s = TCPSocket.open(AppConf.irccat.server,AppConf.irccat.port)
+                s.write(message)
+                s.close
+              end
+            rescue Exception => msg  
+              puts "Something went wrong with sending to irccat: (#{msg})"  
+            end
           end
             
             
           if !AppConf.graphite.nil? && AppConf.graphite.enabled
-            time = Time.now
-            message = "deploys.chef.#{environment.gsub(".json","")} 1 #{time.to_i}\n"
-            s = TCPSocket.open(AppConf.graphite.server,AppConf.graphite.port)
-            s.write(message)
-            s.close
+            begin
+              time = Time.now
+              message = "deploys.chef.#{environment.gsub(".json","")} 1 #{time.to_i}\n"
+              s = TCPSocket.open(AppConf.graphite.server,AppConf.graphite.port)
+              s.write(message)
+              s.close
+            rescue Exception => msg  
+              puts "Something went wrong with sending to graphite: (#{msg})"  
+            end
           end
+          
       end
 
       def save_environment_changes(environment,envjson)
@@ -281,16 +312,32 @@ module KnifeSpork
           ui.warn "It looks like you have multiple cookbook paths defined so I can't tell if you're running inside a git repo.\n\n"
         else
           begin
-            path = cookbook_path[0].gsub("cookbooks","")
+            path = cookbook_path[0].gsub("/cookbooks","")
             ui.msg "Opening git repo #{path}\n\n"
             g = Git.open(path, :log => Logger.new(strio))
             ui.msg "Pulling latest changes from git\n\n"
-            g.pull
+            output = IO.popen ("cd #{path} && git pull 2>&1")
+            Process.wait
+            exit_code = $?            
+            if exit_code.exitstatus ==  0
+              ui.msg "#{output.read()}\n"
+            else
+              ui.error "#{output.read()}\n"
+              exit 1
+            end
+
+            ui.msg "Pulling latest changes from git submodules (if any)\n\n"
+            output = IO.popen ("cd #{path} && git submodule foreach git pull 2>&1")
+            Process.wait
+            exit_code = $?
+            if exit_code.exitstatus ==  0
+              ui.msg "#{output.read()}\n"
+            else
+              ui.error "#{output.read()}\n"
+              exit 1
+            end
           rescue ArgumentError => e
             ui.warn "Git: The root of your chef repo doesn't look like it's a git repo. Skipping git pull...\n\n"
-          rescue
-            ui.warn "Git: Something went wrong with git pull, Dumping log info..."
-            ui.warn "#{strio.string}"
           end
         end
      end

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

@@ -118,12 +118,25 @@ module KnifeSpork
             cookbook.freeze_version
             upload(cookbook, justify_width)
             version_constraints_to_update[cookbook_name] = cookbook.version
-                    
+                  
             if !AppConf.irccat.nil? && AppConf.irccat.enabled
-              message = "#{AppConf.irccat.channel} CHEF: #{ENV['USER']} uploaded and froze cookbook #{cookbook_name} version #{cookbook.version}"
-              s = TCPSocket.open(AppConf.irccat.server,AppConf.irccat.port)
-              s.write(message)
-              s.close
+                begin
+                              
+                  if !AppConf.irccat.channel?(String)
+                    channels = AppConf.irccat.channel
+                  else
+                    channels = ["#{AppConf.irccat.channel}"]
+                  end
+                  
+                  channels.each do |c|
+                      message = "#{c} #BOLD#PURPLECHEF:#NORMAL #{ENV['USER']} uploaded and froze cookbook #TEAL#{cookbook_name}#NORMAL version #TEAL#{cookbook.version}#NORMAL"
+                      s = TCPSocket.open(AppConf.irccat.server,AppConf.irccat.port)
+                      s.write(message)
+                      s.close
+                  end
+               rescue Exception => msg  
+                puts "Something went wrong with sending to irccat: (#{msg})"  
+               end
             end
 
           rescue Chef::Exceptions::CookbookNotFoundInRepo => e

data/lib/knife-spork.rb

@@ -1,3 +1,3 @@
 module KnifeSpork
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jon Cowie
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-03 00:00:00 +00:00
+date: 2012-02-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency