chef-dk 0.14.25 → 0.15.9

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

@@ -32,11 +32,11 @@ 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
+contains a .chef/config.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`.
+`chef-client -z`.
 
 See our detailed README for more information:
 

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

@@ -1,47 +1,47 @@
-#
-# 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 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-require 'pp'
-
-module ChefDK
-  module Command
-
-    # Forwards all commands to rubygems.
-    class GemForwarder < ChefDK::Command::Base
-      banner "Usage: chef gem GEM_COMMANDS_AND_OPTIONS"
-
-      def run(params)
-        retval = Gem::GemRunner.new.run( params.clone )
-        retval.nil? ? true : retval
-      rescue Gem::SystemExitException => e
-        exit( e.exit_code )
-      end
-
-      # Lazy solution: By automatically returning false, we force ChefDK::Base to
-      # call this class' run method, so that Gem::GemRunner can handle the -v flag
-      # appropriately (showing the gem version, or installing a specific version
-      # of a gem).
-      def needs_version?(params)
-        false
-      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 'rubygems'
+require 'rubygems/gem_runner'
+require 'rubygems/exceptions'
+require 'pp'
+
+module ChefDK
+  module Command
+
+    # Forwards all commands to rubygems.
+    class GemForwarder < ChefDK::Command::Base
+      banner "Usage: chef gem GEM_COMMANDS_AND_OPTIONS"
+
+      def run(params)
+        retval = Gem::GemRunner.new.run( params.clone )
+        retval.nil? ? true : retval
+      rescue Gem::SystemExitException => e
+        exit( e.exit_code )
+      end
+
+      # Lazy solution: By automatically returning false, we force ChefDK::Base to
+      # call this class' run method, so that Gem::GemRunner can handle the -v flag
+      # appropriately (showing the gem version, or installing a specific version
+      # of a gem).
+      def needs_version?(params)
+        false
+      end
+    end
+  end
+end

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

@@ -29,6 +29,7 @@ require 'chef-dk/command/generator_commands/template'
 require 'chef-dk/command/generator_commands/repo'
 require 'chef-dk/command/generator_commands/policyfile'
 require 'chef-dk/command/generator_commands/generator_generator'
+require 'chef-dk/command/generator_commands/build_cookbook'
 
 module ChefDK
   module Command
@@ -54,6 +55,7 @@ module ChefDK
       generator(:repo, :Repo, "Generate a Chef code repository")
       generator(:policyfile, :Policyfile, "Generate a Policyfile for use with the install/push commands")
       generator(:generator, :GeneratorGenerator, "Copy ChefDK's generator cookbook so you can customize it")
+      generator(:'build-cookbook', :BuildCookbook, "Generate a build cookbook for use with Delivery")
 
       def self.banner_headline
         <<-E

data/lib/chef-dk/command/generator_commands/app.rb

@@ -1,107 +1,107 @@
-#
-# 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/generator_commands/base'
-
-module ChefDK
-  module Command
-    module GeneratorCommands
-
-      # ## App
-      # chef generate app path/to/basename --generator-cookbook=path/to/generator
-      #
-      # Generates a full "application" directory structure.
-      class App < Base
-
-        banner "Usage: chef generate app NAME [options]"
-
-        attr_reader :errors
-        attr_reader :app_name_or_path
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @app_name = nil
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-          else
-            err(opt_parser)
-            1
-          end
-        rescue ChefDK::ChefRunnerError => e
-          err("ERROR: #{e}")
-          1
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:app_root, app_root)
-          Generator.add_attr_to_context(:app_name, app_name)
-          Generator.add_attr_to_context(:cookbook_root, cookbook_root)
-          Generator.add_attr_to_context(:cookbook_name, cookbook_name)
-          Generator.add_attr_to_context(:recipe_name, recipe_name)
-        end
-
-        def recipe
-          "app"
-        end
-
-        def recipe_name
-          "default"
-        end
-
-        def app_name
-          File.basename(app_full_path)
-        end
-
-        def app_root
-          File.dirname(app_full_path)
-        end
-
-        def cookbook_root
-          File.join(app_full_path, 'cookbooks')
-        end
-
-        def cookbook_name
-          app_name
-        end
-
-        def app_full_path
-          File.expand_path(app_name_or_path, Dir.pwd)
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          @app_name_or_path = arguments[0]
-          @params_valid = false unless @app_name_or_path
-        end
-
-        def params_valid?
-          @params_valid
-        end
-      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/generator_commands/base'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+
+      # ## App
+      # chef generate app path/to/basename --generator-cookbook=path/to/generator
+      #
+      # Generates a full "application" directory structure.
+      class App < Base
+
+        banner "Usage: chef generate app NAME [options]"
+
+        attr_reader :errors
+        attr_reader :app_name_or_path
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def initialize(params)
+          @params_valid = true
+          @app_name = nil
+          super
+        end
+
+        def run
+          read_and_validate_params
+          if params_valid?
+            setup_context
+            chef_runner.converge
+          else
+            err(opt_parser)
+            1
+          end
+        rescue ChefDK::ChefRunnerError => e
+          err("ERROR: #{e}")
+          1
+        end
+
+        def setup_context
+          super
+          Generator.add_attr_to_context(:app_root, app_root)
+          Generator.add_attr_to_context(:app_name, app_name)
+          Generator.add_attr_to_context(:cookbook_root, cookbook_root)
+          Generator.add_attr_to_context(:cookbook_name, cookbook_name)
+          Generator.add_attr_to_context(:recipe_name, recipe_name)
+        end
+
+        def recipe
+          "app"
+        end
+
+        def recipe_name
+          "default"
+        end
+
+        def app_name
+          File.basename(app_full_path)
+        end
+
+        def app_root
+          File.dirname(app_full_path)
+        end
+
+        def cookbook_root
+          File.join(app_full_path, 'cookbooks')
+        end
+
+        def cookbook_name
+          app_name
+        end
+
+        def app_full_path
+          File.expand_path(app_name_or_path, Dir.pwd)
+        end
+
+        def read_and_validate_params
+          arguments = parse_options(params)
+          @app_name_or_path = arguments[0]
+          @params_valid = false unless @app_name_or_path
+        end
+
+        def params_valid?
+          @params_valid
+        end
+      end
+    end
+  end
+end
+