knife-spork 1.2.2 → 1.3.0

data/lib/chef/knife/spork-node-runlistadd.rb

@@ -0,0 +1,48 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  class SporkNodeRunListAdd < Chef::Knife
+    include KnifeSpork::Runner
+
+    banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (options)'
+
+
+    option :after,
+           :short => "-a ITEM",
+           :long  => "--after ITEM",
+           :description => "Place the ENTRY in the run list after ITEM"
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a node name and item to add")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      @object_secondary_name = @name_args[1..-1].map do |entry|
+        entry.split(',').map { |e| e.strip }
+      end.flatten.to_s
+
+      run_plugins(:before_noderunlistadd)
+      pre_node = load_node(@object_name)
+      node_runlistadd
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_noderunlistadd)
+    end
+
+    private
+    def node_runlistadd
+      nrla = Chef::Knife::NodeRunListAdd.new
+      nrla.name_args = @name_args
+      nrla.config[:editor] = config[:editor]
+      nrla.config[:after] = config[:after]
+      nrla.run
+    end
+  end
+end

data/lib/chef/knife/spork-node-runlistremove.rb

@@ -0,0 +1,42 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  class SporkNodeRunListRemove < Chef::Knife
+    include KnifeSpork::Runner
+
+    banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (options)'
+
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a node name and item to remove")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      @object_secondary_name = @name_args[1..-1].map do |entry|
+        entry.split(',').map { |e| e.strip }
+      end.flatten.to_s
+
+      run_plugins(:before_noderunlistremove)
+      pre_node = load_node(@object_name)
+      node_runlistremove
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_noderunlistremove)
+    end
+
+    private
+    def node_runlistremove
+      nrla = Chef::Knife::NodeRunListRemove.new
+      nrla.name_args = @name_args
+      nrla.config[:editor] = config[:editor]
+      nrla.run
+    end
+  end
+end

data/lib/chef/knife/spork-node-runlistset.rb

@@ -0,0 +1,42 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  class SporkNodeRunListSet < Chef::Knife
+    include KnifeSpork::Runner
+
+    banner 'knife spork node run_list set NODE ENTRIES (options)'
+
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.size < 2
+        ui.error "You must supply both a node name and a run list."
+        show_usage
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      @object_secondary_name = @name_args[1..-1].map do |entry|
+        entry.split(',').map { |e| e.strip }
+      end.flatten.to_s
+
+      run_plugins(:before_noderunlistset)
+      pre_node = load_node(@object_name)
+      node_runlistset
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_noderunlistset)
+    end
+
+    private
+    def node_runlistset
+      nrla = Chef::Knife::NodeRunListSet.new
+      nrla.name_args = @name_args
+      nrla.config[:editor] = config[:editor]
+      nrla.run
+    end
+  end
+end

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

@@ -0,0 +1,107 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+
+begin
+  require 'berkshelf'
+rescue LoadError; end
+
+module KnifeSpork
+  class SporkOmni < Chef::Knife
+    include KnifeSpork::Runner
+
+    banner 'knife spork omni COOKBOOK (options)'
+
+    option :cookbook_path,
+           :short => '-o PATH:PATH',
+           :long => '--cookbook-path PATH:PATH',
+           :description => 'A colon-separated path to look for cookbooks in',
+           :proc => lambda { |o| o.split(':') }
+
+    option :depends,
+           :short => '-D',
+           :long => '--include-dependencies',
+           :description => 'Also upload cookbook dependencies during the upload step'
+
+    option :bump_level,
+           :short => '-l',
+           :long  => '--bump-level [major|minor|patch]',
+           :description => 'Version level to bump the cookbook (defaults to patch)',
+           :default => nil
+
+    option :omni_environment,
+           :short => '-e',
+           :long  => '--environment ENVIRONMENT',
+           :description => 'Environment to promote the cookbook to',
+           :default => nil
+
+    option :remote,
+           :long  => '--remote',
+           :description => 'Make omni finish with promote --remote instead of a local promote',
+           :default => nil
+
+    if defined?(::Berkshelf)
+      option :berksfile,
+             :short => '-b',
+             :long => '--berksfile BERKSFILE',
+             :description => 'Path to a Berksfile to operate from',
+             :default => File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME)
+    end
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if name_args.empty?
+        ui.fatal 'You must specify a cookbook name!'
+        show_usage
+        exit(1)
+      end
+
+      cookbook = name_args.first
+
+      run_plugins(:before_omni)
+      omni(cookbook)
+      run_plugins(:after_omni)
+    end
+
+    private
+
+    def bump(cookbook)
+      ui.msg "OMNI: Bumping #{cookbook}"
+      bump = SporkBump.new
+      bump.name_args = [cookbook,config[:bump_level]]
+      bump.run
+    end
+
+    def upload(cookbook)
+      ui.msg "OMNI: Uploading #{cookbook}"
+      upload = SporkUpload.new
+      upload.name_args = [cookbook]
+      upload.config[:cookbook_path] = config[:cookbook_path]
+      upload.config[:depends] = config[:depends]
+      upload.run
+    end
+
+    def promote(cookbook)
+      ui.msg "OMNI: Promoting #{cookbook}"
+      promote = SporkPromote.new
+      if config[:omni_environment]
+        promote.name_args = [config[:omni_environment],cookbook]
+      else
+        promote.name_args = [cookbook]
+      end
+      promote.config[:remote] = config[:remote]
+      if defined?(::Berkshelf)
+        promote.config[:berksfile] = config[:berksfile]
+      end
+      promote.run
+    end
+
+    def omni(cookbook)
+      bump(cookbook)
+      ui.msg ""
+      upload(cookbook)
+      ui.msg ""
+      promote(cookbook)
+    end
+  end
+end

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

@@ -53,12 +53,8 @@ module KnifeSpork
       @environments.each do |e|
         environment = load_environment(e)
 
-        if @cookbook == 'all'
-          ui.msg "Promoting ALL cookbooks to environment #{environment}"
-          promote(environment, all_cookbooks)
-        else
-          promote(environment, @cookbook)
-        end
+
+        promote(environment, @cookbook)
 
         ui.msg "Saving changes to #{e}.json"
 

data/lib/chef/knife/spork-role-create.rb

@@ -0,0 +1,43 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  class SporkRoleCreate < Chef::Knife
+    include KnifeSpork::Runner
+
+    banner 'knife spork role create ROLE (options)'
+
+    option :description,
+           :short => "-d DESC",
+           :long => "--description DESC",
+           :description => "The role description"
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a role name")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      run_plugins(:before_rolecreate)
+      pre_role = {}
+      role_create
+      post_role = load_role(@object_name)
+      @object_difference = json_diff(pre_role,post_role).to_s
+      run_plugins(:after_rolecreate)
+    end
+
+    private
+    def role_create
+      rc = Chef::Knife::RoleCreate.new
+      rc.name_args = @name_args
+      rc.config[:editor] = config[:editor]
+      rc.config[:description] = config[:description]
+      rc.run
+    end
+  end
+end

data/lib/chef/knife/spork-role-delete.rb

@@ -0,0 +1,36 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  class SporkRoleDelete < Chef::Knife
+    include KnifeSpork::Runner
+
+    banner 'knife spork role delete ROLENAME'
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a role name")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      run_plugins(:before_roledelete)
+      pre_role = load_role(@object_name)
+      role_delete
+      post_role = {}
+      @object_difference = json_diff(pre_role,post_role).to_s
+      run_plugins(:after_roledelete)
+    end
+
+    private
+    def role_delete
+      rd = Chef::Knife::RoleDelete.new
+      rd.name_args = @name_args
+      rd.run
+    end
+  end
+end

data/lib/chef/knife/spork-role-edit.rb

@@ -0,0 +1,37 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  class SporkRoleEdit < Chef::Knife
+    include KnifeSpork::Runner
+
+    banner 'knife spork role edit ROLENAME'
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a role name")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      run_plugins(:before_roleedit)
+      pre_role = load_role(@object_name)
+      role_edit
+      post_role = load_role(@object_name)
+      @object_difference = json_diff(pre_role,post_role).to_s
+      run_plugins(:after_roleedit)
+    end
+
+    private
+    def role_edit
+      re = Chef::Knife::RoleEdit.new
+      re.name_args = @name_args
+      re.config[:editor] = config[:editor]
+      re.run
+    end
+  end
+end

data/lib/chef/knife/spork-role-fromfile.rb

@@ -0,0 +1,42 @@
+require 'chef/knife'
+require 'knife-spork/runner'
+require 'json'
+
+module KnifeSpork
+  class SporkRoleFromFile < Chef::Knife
+    include KnifeSpork::Runner
+
+    deps do
+      require 'chef/knife/role_from_file'
+    end
+
+    banner 'knife spork role from file FILENAME'
+
+    def run
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a role name")
+        exit 1
+      end
+
+      @name_args.each do |arg|
+          @object_name = arg.split("/").last
+          run_plugins(:before_rolefromfile)
+          pre_role = load_role(@object_name.gsub(".json","").gsub(".rb",""))
+          role_from_file
+          post_role = load_role(@object_name.gsub(".json","").gsub(".rb",""))
+          @object_difference = json_diff(pre_role,post_role).to_s
+          run_plugins(:after_rolefromfile)
+      end
+    end
+
+    private
+    def role_from_file
+      rff = Chef::Knife::RoleFromFile.new
+      rff.name_args = @name_args
+      rff.run
+    end
+  end
+end

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

@@ -30,6 +30,134 @@ EOH
         end
       end
 
+      def after_rolefromfile
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} uploaded role #{object_name}
+          EOH
+        end
+      end
+
+      def after_roleedit
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} edited role #{object_name}
+          EOH
+        end
+      end
+
+      def after_rolecreate
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} created role #{object_name}
+          EOH
+        end
+      end
+
+      def after_roledelete
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} deleted role #{object_name}
+          EOH
+        end
+      end
+
+      def after_databagedit
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}
+          EOH
+        end
+      end
+
+      def after_databagdelete
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} deleted data bag #{object_name}}
+          EOH
+        end
+      end
+
+      def after_databagitemdelete
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}
+          EOH
+        end
+      end
+
+      def after_databagcreate
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} created data bag #{object_name}
+          EOH
+        end
+      end
+
+      def after_databagfromfile
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}
+          EOH
+        end
+      end
+
+      def after_nodeedit
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} edited node #{object_name}
+          EOH
+        end
+      end
+
+      def after_nodedelete
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} deleted node #{object_name}
+          EOH
+        end
+      end
+
+      def after_nodecreate
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} created node #{object_name}
+          EOH
+        end
+      end
+
+      def after_nodefromfile
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} uploaded node #{object_name}
+          EOH
+        end
+      end
+
+      def after_noderunlistadd
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}
+          EOH
+        end
+      end
+
+      def after_noderunlistremove
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}
+          EOH
+        end
+      end
+
+      def after_noderunlistset
+        campfire do |rooms|
+          rooms.paste <<-EOH
+#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}
+          EOH
+        end
+      end
+
       private
       def campfire(&block)
         safe_require 'campy'