chef-dk 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b9f2f339c70e930b7bee3c3422c8b013e98e43b
-  data.tar.gz: d7cbff8ca1698edf60e5908d52ade0096c66416e
+  metadata.gz: 71929ebb4b2845757688d9de6a8519e2984de9e3
+  data.tar.gz: cbf10aabf6125995c29fe7199ca37e22a5b1d5a8
 SHA512:
-  metadata.gz: c547ff5ccf4d910fa63487fb5d7137fee25944ee3e2482ce96bda6f645b5b93c1b20c03a846faa3a2aecfa3d70242b0431a0e06a762215518ce9880012498f0f
-  data.tar.gz: 701fc497bdb6322659ed4ca70ca45e0b6359c00a14296b12c0e4cb0bab0371db9f8c1f517eed6f7578a3389120ee0ecfa67f99a1f127b9919771837fe9fdafef
+  metadata.gz: 93381f6a0deb08de22ef67c5605adf8221f470523de25b6ae5f6207daddaf4cb8d4414cfc5f2bbd597085fc2e39dc29d11539d1fe8e2f250c131e2fff48eb83a
+  data.tar.gz: a90008e558fb76709c8ca8159532e7132416c24af750538aff94855201479fd7a876a467c3732cbaf5eb66e3cb7f2e99df00d6ecf795c762b3fdb2353c773c8d

data/README.md

@@ -1,6 +1,6 @@
 # Chef Development Kit
 
-Chef Development Kit (Chef DK) brings Chef and the development tools developed by the Chef Community together and acts as the consistent interface to this awesomeness. This awesomeness is composed of:
+Chef Development Kit (ChefDK) brings Chef and the development tools developed by the Chef Community together and acts as the consistent interface to this awesomeness. This awesomeness is composed of:
 
 * [Chef][]
 * [Berkshelf][]

data/lib/chef-dk/authenticated_http.rb

@@ -0,0 +1,40 @@
+#
+# 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/http'
+require 'chef/http/authenticator'
+require 'chef/http/json_input'
+require 'chef/http/json_output'
+require 'chef/http/decompressor'
+require 'chef/http/validate_content_length'
+
+module ChefDK
+  class AuthenticatedHTTP < Chef::HTTP
+
+    use JSONInput
+    use JSONOutput
+    use Decompressor
+    use Authenticator
+
+    # ValidateContentLength should come after Decompressor
+    # because the order of middlewares is reversed when handling
+    # responses.
+    use ValidateContentLength
+
+  end
+end
+

data/lib/chef-dk/chef_runner.rb

@@ -60,6 +60,11 @@ module ChefDK
       Chef::Config.cookbook_path = cookbook_path
       Chef::Config.color = true
       Chef::Config.diff_disabled = true
+
+      # atomic file operations on Windows require Administrator privileges to be able to read the SACL from a file
+      # Using file_staging_uses_destdir(true) will get us inherited permissions indirectly on tempfile creation
+      Chef::Config.file_atomic_update = false if Chef::Platform.windows?
+      Chef::Config.file_staging_uses_destdir = true # Default in Chef 12+
     end
 
     def ohai

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

@@ -24,7 +24,10 @@ module ChefDK
       banner "Usage: chef exec SYSTEM_COMMAND"
 
       def run(params)
-        exec omnibus_env, *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
     end

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

@@ -17,6 +17,16 @@
 
 require 'chef-dk/command/base'
 require 'chef-dk/command/generator_commands'
+require 'chef-dk/command/generator_commands/base'
+require 'chef-dk/command/generator_commands/cookbook_code_file'
+require 'chef-dk/command/generator_commands/cookbook'
+require 'chef-dk/command/generator_commands/app'
+require 'chef-dk/command/generator_commands/attribute'
+require 'chef-dk/command/generator_commands/cookbook_file'
+require 'chef-dk/command/generator_commands/lwrp'
+require 'chef-dk/command/generator_commands/recipe'
+require 'chef-dk/command/generator_commands/template'
+require 'chef-dk/command/generator_commands/repo'
 
 module ChefDK
   module Command
@@ -39,6 +49,7 @@ module ChefDK
       generator(:template, :Template, "Generate a file template")
       generator(:file, :CookbookFile, "Generate a cookbook file")
       generator(:lwrp, :LWRP, "Generate a lightweight resource/provider")
+      generator(:repo, :Repo, "Generate a Chef policy repository")
 
       def self.banner_headline
         <<-E

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

@@ -31,6 +31,26 @@ module ChefDK
     module SharedGeneratorOptions
       include Mixlib::CLI
 
+      # You really want these to have default values, as
+      # they will likely be used all over the place.
+      option :license,
+        :short => "-I LICENSE",
+        :long => "--license LICENSE",
+        :description => "all_rights, apache2, mit, gplv2, gplv3 - defaults to all_rights",
+        :default => "all_rights"
+
+      option :copyright_holder,
+        :short => "-C COPYRIGHT",
+        :long => "--copyright COPYRIGHT",
+        :description => "Name of the copyright holder - defaults to 'The Authors'",
+        :default => "The Authors"
+
+      option :email,
+        :short => "-m EMAIL",
+        :long => "--email EMAIL",
+        :description => "Email address of the author - defaults to 'you@example.com'",
+        :default => 'you@example.com'
+
       option :generator_cookbook,
         :short => "-g GENERATOR_COOKBOOK_PATH",
         :long  => "--generator-cookbook GENERATOR_COOKBOOK_PATH",
@@ -44,374 +64,9 @@ module ChefDK
     #
     # This module is the namespace for all subcommands of `chef generate`
     module GeneratorCommands
-
       def self.build(class_name, params)
         const_get(class_name).new(params)
       end
-
-      # ## Base
-      #
-      # Base class for `chef generate` subcommands. Contains basic behaviors
-      # for setting up the generator context, detecting git, and launching a
-      # chef converge.
-      #
-      # The behavior of the generators is largely delegated to a chef cookbook.
-      # The default implementation is the `code_generator` cookbook in
-      # chef-dk/skeletons/code_generator.
-      class Base < Command::Base
-
-        attr_reader :params
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          super()
-          @params = params
-        end
-
-        # An instance of ChefRunner. Calling ChefRunner#converge will trigger
-        # convergence and generate the desired code.
-        def chef_runner
-          @chef_runner ||= ChefRunner.new(generator_cookbook_path, ["code_generator::#{recipe}"])
-        end
-
-        # Path to the directory where the code_generator cookbook is located.
-        # For now, this is hard coded to the 'skeletons' directory in this
-        # repo.
-        def generator_cookbook_path
-          config[:generator_cookbook]
-        end
-
-        # Sets git related generator_context values.
-        def setup_context
-          Generator.context.have_git = have_git?
-          Generator.context.skip_git_init = false
-        end
-
-        # Delegates to `Generator.context`, the singleton instance of
-        # Generator::Context
-        def generator_context
-          Generator.context
-        end
-
-        # Checks the `PATH` for the presence of a `git` (or `git.exe`, on
-        # windows) executable.
-        def have_git?
-          path = ENV["PATH"] || ""
-          paths = path.split(File::PATH_SEPARATOR)
-          paths.any? {|bin_path| File.exist?(File.join(bin_path, "git#{RbConfig::CONFIG['EXEEXT']}"))}
-        end
-
-      end
-
-      # ## 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
-            msg(banner)
-            1
-          end
-        end
-
-        def setup_context
-          super
-          generator_context.app_root = app_root
-          generator_context.app_name = app_name
-          generator_context.cookbook_root ||= cookbook_root
-          generator_context.cookbook_name ||= cookbook_name
-        end
-
-        def recipe
-          "app"
-        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
-
-      # ## CookbookFile
-      # chef generate cookbook path/to/basename --generator-cookbook=path/to/generator
-      #
-      # Generates a basic cookbook directory structure. Most file types are
-      # omitted, the user is expected to add additional files as needed using
-      # the relevant generators.
-      class Cookbook < Base
-
-        banner "Usage: chef generate cookbook NAME [options]"
-
-        attr_reader :errors
-
-        attr_reader :cookbook_name_or_path
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @cookbook_name = nil
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-          else
-            msg(banner)
-            1
-          end
-        end
-
-        def setup_context
-          super
-          generator_context.skip_git_init = cookbook_path_in_git_repo?
-          generator_context.cookbook_root = cookbook_root
-          generator_context.cookbook_name = cookbook_name
-        end
-
-        def recipe
-          "cookbook"
-        end
-
-        def cookbook_name
-          File.basename(cookbook_full_path)
-        end
-
-        def cookbook_root
-          File.dirname(cookbook_full_path)
-        end
-
-        def cookbook_full_path
-          File.expand_path(cookbook_name_or_path, Dir.pwd)
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          @cookbook_name_or_path = arguments[0]
-          @params_valid = false unless @cookbook_name_or_path
-        end
-
-        def params_valid?
-          @params_valid
-        end
-
-        def cookbook_path_in_git_repo?
-          Pathname.new(cookbook_full_path).ascend do |dir|
-            return true if File.directory?(File.join(dir.to_s, ".git"))
-          end
-          false
-        end
-
-      end
-
-      # ## CookbookCodeFile
-      # A base class for generators that add individual files to existing
-      # cookbooks.
-      class CookbookCodeFile < Base
-
-        attr_reader :errors
-        attr_reader :cookbook_path
-        attr_reader :new_file_basename
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @cookbook_full_path = nil
-          @new_file_basename = nil
-          @errors = []
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-          else
-            errors.each {|error| err("Error: #{error}") }
-            parse_options
-            msg(opt_parser)
-            1
-          end
-        end
-
-        def setup_context
-          super
-          generator_context.cookbook_root = cookbook_root
-          generator_context.cookbook_name = cookbook_name
-          generator_context.new_file_basename = new_file_basename
-        end
-
-        def cookbook_root
-          File.dirname(cookbook_path)
-        end
-
-        def cookbook_name
-          File.basename(cookbook_path)
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          case arguments.size
-          when 1
-            @new_file_basename = arguments[0]
-            @cookbook_path = Dir.pwd
-            validate_cookbook_path
-          when 2
-            @cookbook_path = arguments[0]
-            @new_file_basename = arguments[1]
-          else
-            @params_valid = false
-          end
-        end
-
-        def validate_cookbook_path
-          unless File.directory?(File.join(cookbook_path, "recipes"))
-            @errors << "Directory #{cookbook_path} is not a cookbook"
-            @params_valid = false
-          end
-        end
-
-        def params_valid?
-          @params_valid
-        end
-      end
-
-      # chef generate recipe [path/to/cookbook/root] name
-      class Recipe < CookbookCodeFile
-
-        banner "Usage: chef generate recipe [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          'recipe'
-        end
-
-      end
-
-      # chef generate attribute [path/to/cookbook_root] NAME
-      class Attribute < CookbookCodeFile
-
-        banner "Usage: chef generate attribute [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          'attribute'
-        end
-
-      end
-
-      # chef generate lwrp [path/to/cookbook_root] NAME
-      class LWRP < CookbookCodeFile
-
-        banner "Usage: chef generate lwrp [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          'lwrp'
-        end
-
-      end
-
-      # chef generate template [path/to/cookbook_root] name --source=source_file
-      class Template < CookbookCodeFile
-
-        option :source,
-          :short => "-s SOURCE_FILE",
-          :long  => "--source SOURCE_FILE",
-          :description => "Copy content from SOURCE_FILE"
-
-        banner "Usage: chef generate template [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          'template'
-        end
-
-        def setup_context
-          super
-          generator_context.content_source = config[:source]
-        end
-
-      end
-
-      # chef generate file [path/to/cookbook_root] name --source=source_file
-      class CookbookFile < CookbookCodeFile
-        option :source,
-          :short => "-s SOURCE_FILE",
-          :long  => "--source SOURCE_FILE",
-          :description => "Copy content from SOURCE_FILE"
-
-        banner "Usage: chef generate file [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          'cookbook_file'
-        end
-
-        def setup_context
-          super
-          generator_context.content_source = config[:source]
-        end
-      end
-
     end
-
-
   end
 end