knife-spork 1.7.2 → 1.7.3

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

@@ -1,46 +1,46 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkRoleCreate < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork role create ROLE (options)'
-
-    option :description,
-           :short => "-d DESC",
-           :long => "--description DESC",
-           :description => "The role description"
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      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
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkRoleCreate < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork role create ROLE (options)'
+
+    option :description,
+           :short => "-d DESC",
+           :long => "--description DESC",
+           :description => "The role description"
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      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

@@ -1,50 +1,50 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkRoleDelete < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'chef/search/query'
-    end
-
-    banner 'knife spork role delete ROLENAME (options)'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      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)
-
-      if spork_config.role_safe_delete
-        query = Chef::Search::Query.new
-        nodes = query.search('node', "roles:#{@object_name}").first
-        if nodes.size > 0
-          ui.fatal("#{nodes.size} nodes have been found which still contain the role #{@object_name} in their runlists. Please remove this role from all runlists before deleting it.")
-          exit(1)
-        end
-      end
-
-      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
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkRoleDelete < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'chef/search/query'
+    end
+
+    banner 'knife spork role delete ROLENAME (options)'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      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)
+
+      if spork_config.role_safe_delete
+        query = Chef::Search::Query.new
+        nodes = query.search('node', "roles:#{@object_name}").first
+        if nodes.size > 0
+          ui.fatal("#{nodes.size} nodes have been found which still contain the role #{@object_name} in their runlists. Please remove this role from all runlists before deleting it.")
+          exit(1)
+        end
+      end
+
+      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

@@ -1,40 +1,40 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkRoleEdit < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork role edit ROLENAME (options)'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      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
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkRoleEdit < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork role edit ROLENAME (options)'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      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

@@ -1,65 +1,65 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkRoleFromFile < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'json'
-      require 'chef/knife/role_from_file'
-    end
-
-    banner 'knife spork role from file FILENAME (options)'
-
-    option :match_filename,
-        :long => '--match-filename',
-        :short => '-f',
-        :description => 'Ensure that the filename matches the name specified in the role (true|false).',
-        :boolean => true,
-        :default => false
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      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)
-          begin
-            pre_role = load_role(@object_name.gsub(".json","").gsub(".rb",""))
-          rescue Net::HTTPServerException => e
-            pre_role = {}
-          end
-          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
-      if (config[:match_filename] || spork_config[:role_match_file_name])
-        ## Check if file names match role names 
-        @name_args.each do |arg|
-            file_name = arg.split("/").last
-            role = rff.loader.load_from("roles", file_name)
-            file_name = file_name.gsub(".json","").gsub(".rb", "")
-            if file_name != role.name
-                ui.error("Role name in file #{role.name} does not match file name #{file_name}")
-                exit 1
-            end
-        end
-      end
-      rff.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkRoleFromFile < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'json'
+      require 'chef/knife/role_from_file'
+    end
+
+    banner 'knife spork role from file FILENAME (options)'
+
+    option :match_filename,
+        :long => '--match-filename',
+        :short => '-f',
+        :description => 'Ensure that the filename matches the name specified in the role (true|false).',
+        :boolean => true,
+        :default => false
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      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)
+          begin
+            pre_role = load_role(@object_name.gsub(".json","").gsub(".rb",""))
+          rescue Net::HTTPServerException => e
+            pre_role = {}
+          end
+          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
+      if (config[:match_filename] || spork_config[:role_match_file_name])
+        ## Check if file names match role names 
+        @name_args.each do |arg|
+            file_name = arg.split("/").last
+            role = rff.loader.load_from("roles", file_name)
+            file_name = file_name.gsub(".json","").gsub(".rb", "")
+            if file_name != role.name
+                ui.error("Role name in file #{role.name} does not match file name #{file_name}")
+                exit 1
+            end
+        end
+      end
+      rff.run
+    end
+  end
+end

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

@@ -1,151 +1,151 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkUpload < Chef::Knife
-
-    deps do
-      require 'chef/exceptions'
-      require 'chef/cookbook_loader'
-      require 'chef/cookbook_uploader'
-      require 'knife-spork/runner'
-      require 'socket'
-    end
-
-    CHECKSUM = 'checksum'
-    MATCH_CHECKSUM = /[0-9a-f]{32,}/
-
-    banner 'knife spork upload [COOKBOOKS...] (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 :freeze,
-      :long => '--freeze',
-      :description => 'Freeze this version of the cookbook so that it cannot be overwritten',
-      :boolean => true
-
-    option :depends,
-      :short => '-D',
-      :long => '--include-dependencies',
-      :description => 'Also upload cookbook dependencies'
-
-    option :berksfile,
-      :short => '-b',
-      :long => 'berksfile',
-      :description => 'Path to a Berksfile to operate off of',
-      :default => nil,
-      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-      config[:cookbook_path] ||= Chef::Config[:cookbook_path]
-
-      if @name_args.empty?
-        show_usage
-        ui.error("You must specify the --all flag or at least one cookbook name")
-        exit 1
-      end
-
-      # Temporary fix for #138 to allow Berkshelf functionality
-      # to be bypassed until #85 has been completed and Berkshelf 3 support added
-      unload_berkshelf_if_specified
-
-      #First load so plugins etc know what to work with
-      @cookbooks = load_cookbooks(name_args)
-      include_dependencies if config[:depends]
-
-      run_plugins(:before_upload)
-
-      #Reload cookbook in case a VCS plugin found updates
-      @cookbooks = load_cookbooks(name_args)
-      include_dependencies if config[:depends]
-
-      upload
-      run_plugins(:after_upload)
-    end
-
-    private
-    def include_dependencies
-      @cookbooks.each do |cookbook|
-        @cookbooks.concat(load_cookbooks(cookbook.metadata.dependencies.keys))
-      end
-
-      @cookbooks.uniq!
-    end
-
-    def upload
-      # upload cookbooks in reverse so that dependencies are satisfied first
-      @cookbooks.reverse.each do |cookbook|
-        begin
-          check_dependencies(cookbook)
-          if name_args.include?(cookbook.name.to_s)
-            if Gem::Version.new(Chef::VERSION).release >= Gem::Version.new('12.0.0')
-              uploader = Chef::CookbookUploader.new(cookbook)
-            else
-              uploader = Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path)
-            end
-            begin
-              if uploader.respond_to?(:upload_cookbooks)
-                # Chef >= 10.14.0
-                uploader.upload_cookbooks
-                ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
-                cookbook.freeze_version
-                uploader.upload_cookbooks
-              else
-                uploader.upload_cookbook
-                ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
-                cookbook.freeze_version
-                uploader.upload_cookbook
-
-              end
-            rescue Chef::Exceptions::CookbookFrozen => msg
-              ui.error "#{cookbook.name}@#{cookbook.version} is frozen. Please bump your version number before continuing!"
-              exit(1)
-            end
-          end
-        rescue Net::HTTPServerException => e
-          if e.response.code == '409'
-            ui.error "#{cookbook.name}@#{cookbook.version} is frozen. Please bump your version number before continuing!"
-            exit(1)
-          else
-            raise
-          end
-        end
-      end
-
-      ui.msg "Successfully uploaded #{@cookbooks.collect{|c| "#{c.name}@#{c.version}"}.join(', ')}!"
-    end
-
-    # Ensures that all the cookbooks dependencies are either already on the server or being uploaded in this pass
-    def check_dependencies(cookbook)
-      negotiate_protocol_version
-      cookbook.metadata.dependencies.each do |cookbook_name, version|
-        unless server_has_version(cookbook_name, version)
-          ui.error "#{cookbook.name} depends on #{cookbook_name} (#{version}), which is not currently being uploaded and cannot be found on the server!"
-          exit(1)
-        end
-      end
-    end
-
-    def server_has_version(cookbook_name, version)
-      hash = server_side_cookbooks[cookbook_name]
-      hash && hash['versions'] && hash['versions'].any?{ |v| Chef::VersionConstraint.new(version).include?(v['version']) }
-    end
-
-    def server_side_cookbooks
-      if Chef::CookbookVersion.respond_to?(:list_all_versions)
-        @server_side_cookbooks ||= Chef::CookbookVersion.list_all_versions
-      else
-        @server_side_cookbooks ||= Chef::CookbookVersion.list
-      end
-    end
-
-    def negotiate_protocol_version
-      server_side_cookbooks
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkUpload < Chef::Knife
+
+    deps do
+      require 'chef/exceptions'
+      require 'chef/cookbook_loader'
+      require 'chef/cookbook_uploader'
+      require 'knife-spork/runner'
+      require 'socket'
+    end
+
+    CHECKSUM = 'checksum'
+    MATCH_CHECKSUM = /[0-9a-f]{32,}/
+
+    banner 'knife spork upload [COOKBOOKS...] (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 :freeze,
+      :long => '--freeze',
+      :description => 'Freeze this version of the cookbook so that it cannot be overwritten',
+      :boolean => true
+
+    option :depends,
+      :short => '-D',
+      :long => '--include-dependencies',
+      :description => 'Also upload cookbook dependencies'
+
+    option :berksfile,
+      :short => '-b',
+      :long => 'berksfile',
+      :description => 'Path to a Berksfile to operate off of',
+      :default => nil,
+      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+      config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify the --all flag or at least one cookbook name")
+        exit 1
+      end
+
+      # Temporary fix for #138 to allow Berkshelf functionality
+      # to be bypassed until #85 has been completed and Berkshelf 3 support added
+      unload_berkshelf_if_specified
+
+      #First load so plugins etc know what to work with
+      @cookbooks = load_cookbooks(name_args)
+      include_dependencies if config[:depends]
+
+      run_plugins(:before_upload)
+
+      #Reload cookbook in case a VCS plugin found updates
+      @cookbooks = load_cookbooks(name_args)
+      include_dependencies if config[:depends]
+
+      upload
+      run_plugins(:after_upload)
+    end
+
+    private
+    def include_dependencies
+      @cookbooks.each do |cookbook|
+        @cookbooks.concat(load_cookbooks(cookbook.metadata.dependencies.keys))
+      end
+
+      @cookbooks.uniq!
+    end
+
+    def upload
+      # upload cookbooks in reverse so that dependencies are satisfied first
+      @cookbooks.reverse.each do |cookbook|
+        begin
+          check_dependencies(cookbook)
+          if name_args.include?(cookbook.name.to_s)
+            if Gem::Version.new(Chef::VERSION).release >= Gem::Version.new('12.0.0')
+              uploader = Chef::CookbookUploader.new(cookbook)
+            else
+              uploader = Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path)
+            end
+            begin
+              if uploader.respond_to?(:upload_cookbooks)
+                # Chef >= 10.14.0
+                uploader.upload_cookbooks
+                ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
+                cookbook.freeze_version
+                uploader.upload_cookbooks
+              else
+                uploader.upload_cookbook
+                ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
+                cookbook.freeze_version
+                uploader.upload_cookbook
+
+              end
+            rescue Chef::Exceptions::CookbookFrozen => msg
+              ui.error "#{cookbook.name}@#{cookbook.version} is frozen. Please bump your version number before continuing!"
+              exit(1)
+            end
+          end
+        rescue Net::HTTPServerException => e
+          if e.response.code == '409'
+            ui.error "#{cookbook.name}@#{cookbook.version} is frozen. Please bump your version number before continuing!"
+            exit(1)
+          else
+            raise
+          end
+        end
+      end
+
+      ui.msg "Successfully uploaded #{@cookbooks.collect{|c| "#{c.name}@#{c.version}"}.join(', ')}!"
+    end
+
+    # Ensures that all the cookbooks dependencies are either already on the server or being uploaded in this pass
+    def check_dependencies(cookbook)
+      negotiate_protocol_version
+      cookbook.metadata.dependencies.each do |cookbook_name, version|
+        unless server_has_version(cookbook_name, version)
+          ui.error "#{cookbook.name} depends on #{cookbook_name} (#{version}), which is not currently being uploaded and cannot be found on the server!"
+          exit(1)
+        end
+      end
+    end
+
+    def server_has_version(cookbook_name, version)
+      hash = server_side_cookbooks[cookbook_name]
+      hash && hash['versions'] && hash['versions'].any?{ |v| Chef::VersionConstraint.new(version).include?(v['version']) }
+    end
+
+    def server_side_cookbooks
+      if Chef::CookbookVersion.respond_to?(:list_all_versions)
+        @server_side_cookbooks ||= Chef::CookbookVersion.list_all_versions
+      else
+        @server_side_cookbooks ||= Chef::CookbookVersion.list
+      end
+    end
+
+    def negotiate_protocol_version
+      server_side_cookbooks
+    end
+  end
+end