chef-dk 0.8.0 → 0.9.0

data/lib/chef-dk/command/env.rb

@@ -1,90 +1,90 @@
-#
-# Copyright:: Copyright (c) 2015 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef-dk/command/base'
-require 'chef-dk/cookbook_omnifetch'
-require 'chef-dk/ui'
-require 'chef-dk/version'
-require 'mixlib/shellout'
-require 'yaml'
-
-module ChefDK
-  module Command
-    class Env < ChefDK::Command::Base
-      banner "Usage: chef env"
-
-      attr_accessor :ui
-
-      def initialize(*args)
-        super
-        @ui = UI.new
-      end
-
-      def run(params)
-        info = {}
-        info['Chef Development Kit'] = Hash.new.tap do |chefdk_env|
-          chefdk_env['ChefDK'] = chefdk_info
-          chefdk_env['Ruby'] = ruby_info
-          chefdk_env['Path'] = paths
-        end
-        ui.msg info.to_yaml
-      end
-
-      def chefdk_info
-        Hash.new.tap do |chefdk|
-          chefdk['ChefDK Version'] = ChefDK::VERSION
-          chefdk['ChefDK Home'] = chefdk_home
-          chefdk['ChefDK Install Directory'] = omnibus_root
-          chefdk['Policyfile Config'] = policyfile_config
-        end
-      end
-
-      def ruby_info
-        Hash.new.tap do |ruby|
-          ruby['Ruby Executable'] = Gem.ruby
-          ruby['Ruby Version'] = RUBY_VERSION
-          ruby['RubyGems'] = Hash.new.tap do |rubygems|
-            rubygems['RubyGems Version'] = Gem::VERSION
-            rubygems['RubyGems Platforms'] = Gem.platforms.map(&:to_s)
-            rubygems['Gem Environment'] = gem_environment
-          end
-        end
-      end
-
-      def gem_environment
-        Hash.new.tap do |h|
-          h['GEM ROOT'] = omnibus_env['GEM_ROOT']
-          h['GEM HOME'] = omnibus_env['GEM_HOME']
-          h['GEM PATHS'] = omnibus_env['GEM_PATH'].split(File::PATH_SEPARATOR)
-        end
-      end
-
-      def paths
-        omnibus_env['PATH'].split(File::PATH_SEPARATOR)
-      end
-
-      def policyfile_config
-        Hash.new.tap do |h|
-          h['Cache Path'] = CookbookOmnifetch.cache_path
-          h['Storage Path'] = CookbookOmnifetch.storage_path.to_s
-        end
-      end
-
-    end
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2015 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef-dk/command/base'
+require 'chef-dk/cookbook_omnifetch'
+require 'chef-dk/ui'
+require 'chef-dk/version'
+require 'mixlib/shellout'
+require 'yaml'
+
+module ChefDK
+  module Command
+    class Env < ChefDK::Command::Base
+      banner "Usage: chef env"
+
+      attr_accessor :ui
+
+      def initialize(*args)
+        super
+        @ui = UI.new
+      end
+
+      def run(params)
+        info = {}
+        info['Chef Development Kit'] = Hash.new.tap do |chefdk_env|
+          chefdk_env['ChefDK'] = chefdk_info
+          chefdk_env['Ruby'] = ruby_info
+          chefdk_env['Path'] = paths
+        end
+        ui.msg info.to_yaml
+      end
+
+      def chefdk_info
+        Hash.new.tap do |chefdk|
+          chefdk['ChefDK Version'] = ChefDK::VERSION
+          chefdk['ChefDK Home'] = chefdk_home
+          chefdk['ChefDK Install Directory'] = omnibus_root
+          chefdk['Policyfile Config'] = policyfile_config
+        end
+      end
+
+      def ruby_info
+        Hash.new.tap do |ruby|
+          ruby['Ruby Executable'] = Gem.ruby
+          ruby['Ruby Version'] = RUBY_VERSION
+          ruby['RubyGems'] = Hash.new.tap do |rubygems|
+            rubygems['RubyGems Version'] = Gem::VERSION
+            rubygems['RubyGems Platforms'] = Gem.platforms.map(&:to_s)
+            rubygems['Gem Environment'] = gem_environment
+          end
+        end
+      end
+
+      def gem_environment
+        Hash.new.tap do |h|
+          h['GEM ROOT'] = omnibus_env['GEM_ROOT']
+          h['GEM HOME'] = omnibus_env['GEM_HOME']
+          h['GEM PATHS'] = omnibus_env['GEM_PATH'].split(File::PATH_SEPARATOR)
+        end
+      end
+
+      def paths
+        omnibus_env['PATH'].split(File::PATH_SEPARATOR)
+      end
+
+      def policyfile_config
+        Hash.new.tap do |h|
+          h['Cache Path'] = CookbookOmnifetch.cache_path
+          h['Storage Path'] = CookbookOmnifetch.storage_path.to_s
+        end
+      end
+
+    end
+  end
+end
+

data/lib/chef-dk/command/exec.rb

@@ -1,45 +1,45 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef-dk/command/base'
-require 'mixlib/shellout'
-
-module ChefDK
-  module Command
-    class Exec < ChefDK::Command::Base
-      banner "Usage: chef exec SYSTEM_COMMAND"
-
-      def run(params)
-        # Set ENV directly on the "parent" process (us) before running #exec to
-        # ensure the custom PATH is honored when finding the command to exec
-        omnibus_env.each {|var, value| ENV[var] = value }
-        exec(*params)
-        raise "Exec failed without an exception, your ruby is buggy"  # should never get here
-      end
-
-      def needs_version?(params)
-        # Force version to get passed down to command
-        false
-      end
-
-      def needs_help?(params)
-        ['-h', '--help'].include? params[0]
-      end
-    end
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef-dk/command/base'
+require 'mixlib/shellout'
+
+module ChefDK
+  module Command
+    class Exec < ChefDK::Command::Base
+      banner "Usage: chef exec SYSTEM_COMMAND"
+
+      def run(params)
+        # Set ENV directly on the "parent" process (us) before running #exec to
+        # ensure the custom PATH is honored when finding the command to exec
+        omnibus_env.each {|var, value| ENV[var] = value }
+        exec(*params)
+        raise "Exec failed without an exception, your ruby is buggy"  # should never get here
+      end
+
+      def needs_version?(params)
+        # Force version to get passed down to command
+        false
+      end
+
+      def needs_help?(params)
+        ['-h', '--help'].include? params[0]
+      end
+    end
+  end
+end
+

data/lib/chef-dk/command/export.rb

@@ -1,153 +1,151 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/export_repo'
-require 'chef-dk/configurable'
-
-module ChefDK
-  module Command
-
-    class Export < Base
-
-      include Configurable
-
-      banner(<<-E)
-Usage: chef export [ POLICY_FILE ] DESTINATION_DIRECTORY [options]
-
-`chef export` creates a Chef Zero compatible Chef repository containing the
-cookbooks described in a Policyfile.lock.json. Once the exported repo is copied
-to the target machine, you can apply the policy to the machine with
-`chef-client -z`. You will need at least the following config:
-
-    use_policyfile true
-    deployment_group '$POLICY_NAME-local'
-    versioned_cookbooks true
-    policy_document_native_api false
-
-See our detailed README for more information:
-
-https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
-
-Options:
-
-E
-
-      option :archive,
-        short:       "-a",
-        long:        "--archive",
-        description: "Export as a tarball archive rather than a directory",
-        default:     false,
-        boolean:     true
-
-      option :force,
-        short:       "-f",
-        long:        "--force",
-        description: "If the DESTINATION_DIRECTORY is not empty, remove its content.",
-        default:     false,
-        boolean:     true
-
-      option :debug,
-        short:       "-D",
-        long:        "--debug",
-        description: "Enable stacktraces and other debug output",
-        default:     false
-
-      attr_reader :policyfile_relative_path
-      attr_reader :export_dir
-
-      attr_accessor :ui
-
-      def initialize(*args)
-        super
-        @push = nil
-        @ui = nil
-        @policyfile_relative_path = nil
-        @export_dir = nil
-        @chef_config = nil
-        @ui = UI.new
-      end
-
-      def run(params = [])
-        return 1 unless apply_params!(params)
-        export_service.run
-        ui.msg("Exported policy '#{export_service.policyfile_lock.name}' to #{export_target}")
-        0
-      rescue ExportDirNotEmpty => e
-        ui.err("ERROR: " + e.message)
-        ui.err("Use --force to force export")
-        1
-      rescue PolicyfileServiceError => e
-        handle_error(e)
-        1
-      end
-
-      def export_target
-        if archive?
-          export_service.archive_file_location
-        else
-          export_dir
-        end
-      end
-
-      def debug?
-        !!config[:debug]
-      end
-
-      def archive?
-        !!config[:archive]
-      end
-
-      def export_service
-        @export_service ||= PolicyfileServices::ExportRepo.new(policyfile: policyfile_relative_path,
-                                                       export_dir: export_dir,
-                                                       root_dir: Dir.pwd,
-                                                       archive: archive?,
-                                                       force: config[:force])
-      end
-
-      def handle_error(error)
-        ui.err("Error: #{error.message}")
-        if error.respond_to?(:reason)
-          ui.err("Reason: #{error.reason}")
-          ui.err("")
-          ui.err(error.extended_error_info) if debug?
-          ui.err(error.cause.backtrace.join("\n")) if debug?
-        end
-      end
-
-      def apply_params!(params)
-        remaining_args = parse_options(params)
-        case remaining_args.size
-        when 1
-          @export_dir = remaining_args[0]
-        when 2
-          @policyfile_relative_path, @export_dir = remaining_args
-        else
-          ui.err(opt_parser)
-          ui.err("\n")
-          return false
-        end
-        true
-      end
-
-    end
-  end
-end
-
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef-dk/command/base'
+require 'chef-dk/ui'
+require 'chef-dk/policyfile_services/export_repo'
+require 'chef-dk/configurable'
+
+module ChefDK
+  module Command
+
+    class Export < Base
+
+      include Configurable
+
+      banner(<<-E)
+Usage: chef export [ POLICY_FILE ] DESTINATION_DIRECTORY [options]
+
+`chef export` creates a Chef Zero compatible Chef repository containing the
+cookbooks described in a Policyfile.lock.json. The exported repository also
+contains a client.rb which configures chef to apply your policy. Once the
+exported repo is copied to the target machine, you can apply the policy to the
+machine with:
+
+`chef-client -c client.rb -z`.
+
+See our detailed README for more information:
+
+https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
+
+Options:
+
+E
+
+      option :archive,
+        short:       "-a",
+        long:        "--archive",
+        description: "Export as a tarball archive rather than a directory",
+        default:     false,
+        boolean:     true
+
+      option :force,
+        short:       "-f",
+        long:        "--force",
+        description: "If the DESTINATION_DIRECTORY is not empty, remove its content.",
+        default:     false,
+        boolean:     true
+
+      option :debug,
+        short:       "-D",
+        long:        "--debug",
+        description: "Enable stacktraces and other debug output",
+        default:     false
+
+      attr_reader :policyfile_relative_path
+      attr_reader :export_dir
+
+      attr_accessor :ui
+
+      def initialize(*args)
+        super
+        @push = nil
+        @ui = nil
+        @policyfile_relative_path = nil
+        @export_dir = nil
+        @chef_config = nil
+        @ui = UI.new
+      end
+
+      def run(params = [])
+        return 1 unless apply_params!(params)
+        export_service.run
+        ui.msg("Exported policy '#{export_service.policyfile_lock.name}' to #{export_target}")
+        0
+      rescue ExportDirNotEmpty => e
+        ui.err("ERROR: " + e.message)
+        ui.err("Use --force to force export")
+        1
+      rescue PolicyfileServiceError => e
+        handle_error(e)
+        1
+      end
+
+      def export_target
+        if archive?
+          export_service.archive_file_location
+        else
+          export_dir
+        end
+      end
+
+      def debug?
+        !!config[:debug]
+      end
+
+      def archive?
+        !!config[:archive]
+      end
+
+      def export_service
+        @export_service ||= PolicyfileServices::ExportRepo.new(policyfile: policyfile_relative_path,
+                                                       export_dir: export_dir,
+                                                       root_dir: Dir.pwd,
+                                                       archive: archive?,
+                                                       force: config[:force])
+      end
+
+      def handle_error(error)
+        ui.err("Error: #{error.message}")
+        if error.respond_to?(:reason)
+          ui.err("Reason: #{error.reason}")
+          ui.err("")
+          ui.err(error.extended_error_info) if debug?
+          ui.err(error.cause.backtrace.join("\n")) if debug?
+        end
+      end
+
+      def apply_params!(params)
+        remaining_args = parse_options(params)
+        case remaining_args.size
+        when 1
+          @export_dir = remaining_args[0]
+        when 2
+          @policyfile_relative_path, @export_dir = remaining_args
+        else
+          ui.err(opt_parser)
+          ui.err("\n")
+          return false
+        end
+        true
+      end
+
+    end
+  end
+end
+
+