chef-dk 0.2.0 → 0.2.1

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

@@ -0,0 +1,36 @@
+#
+# 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/cookbook_code_file'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+      # 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
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+#
+# 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/cookbook_code_file'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+      # 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
+    end
+  end
+end

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

@@ -0,0 +1,96 @@
+#
+# 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
+
+      # ## Repo
+      # chef generate repo path/to/basename --generator-cookbook=path/to/generator --policy-only
+      #
+      # Generates a full "chef-repo" directory structure.
+      class Repo < Base
+
+        banner "Usage: chef generate repo NAME [options]"
+
+        attr_reader :errors
+        attr_reader :repo_name_or_path
+
+        option :policy_only,
+          :short => "-p",
+          :long => "--policy-only",
+          :description => "Create a repository for policy only, not cookbooks",
+          :default => false
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def initialize(params)
+          @params_valid = true
+          @repo_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.add_attr_to_context(:repo_root, repo_root)
+          Generator.add_attr_to_context(:repo_name, repo_name)
+        end
+
+        def recipe
+          "repo"
+        end
+
+        def repo_name
+          File.basename(repo_full_path)
+        end
+
+        def repo_root
+          File.dirname(repo_full_path)
+        end
+
+        def repo_full_path
+          File.expand_path(repo_name_or_path, Dir.pwd)
+        end
+
+        def read_and_validate_params
+          arguments = parse_options(params)
+          @repo_name_or_path = arguments[0]
+          @params_valid = false unless @repo_name_or_path
+        end
+
+        def params_valid?
+          @params_valid
+        end
+      end
+    end
+  end
+end
+
+

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

@@ -0,0 +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/generator_commands/cookbook_code_file'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+      # chef generate template [path/to/cookbook_root] name --source=source_file
+      class Template < CookbookCodeFile
+
+        option :content_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
+        end
+      end
+    end
+  end
+end

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

@@ -114,6 +114,34 @@ module ChefDK
         c.smoke_test { run_in_tmpdir("chef generate cookbook example") }
       end
 
+      add_component "chefspec" do |c|
+        c.gem_base_dir = "chefspec"
+        c.unit_test { sh("rake unit") }
+        c.smoke_test do
+          tmpdir do |cwd|
+            FileUtils.mkdir(File.join(cwd, "spec"))
+            File.open(File.join(cwd, "spec", "spec_helper.rb"), "w+") do |f|
+              f.write <<-EOF
+require 'chefspec'
+require 'chefspec/berkshelf'
+require 'chefspec/cacher'
+
+RSpec.configure do |config|
+    config.expect_with(:rspec) { |c| c.syntax = :expect }
+end
+              EOF
+            end
+            FileUtils.touch(File.join(cwd, "Berksfile"))
+            File.open(File.join(cwd, "spec", "foo_spec.rb"), "w+") do |f|
+              f.write <<-EOF
+require 'spec_helper'
+              EOF
+            end
+            sh("rspec", cwd: cwd)
+          end
+        end
+      end
+
       attr_reader :verification_threads
       attr_reader :verification_results
       attr_reader :verification_status

data/lib/chef-dk/component_test.rb

@@ -50,6 +50,8 @@ module ChefDK
       @unit_test = DEFAULT_TEST
       @integration_test = DEFAULT_TEST
       @smoke_test = DEFAULT_TEST
+      @base_dir = nil
+      @gem_name_for_base_dir = nil
     end
 
     def unit_test(&test_block)
@@ -118,11 +120,22 @@ module ChefDK
     end
 
     def component_path
-      File.join(omnibus_apps_dir, base_dir)
+      if base_dir
+        File.join(omnibus_apps_dir, base_dir)
+      elsif gem_base_dir
+        gem_base_dir
+      else
+        raise "`base_dir` or `gem_base_dir` must be defined for component `#{name}`"
+      end
+    end
+
+    def gem_base_dir
+      return nil if @gem_name_for_base_dir.nil?
+      Gem::Specification::find_by_name(@gem_name_for_base_dir).gem_dir
     end
 
-    def base_dir
-      @base_dir or raise "`base_dir` must be defined for component `#{name}`"
+    def gem_base_dir=(gem_name)
+      @gem_name_for_base_dir = gem_name
     end
 
     def omnibus_root

data/lib/chef-dk/cookbook_omnifetch.rb

@@ -19,6 +19,8 @@ require 'cookbook-omnifetch'
 require 'chef-dk/shell_out'
 require 'chef-dk/cookbook_metadata'
 
+require 'chef/http/simple'
+
 # Configure CookbookOmnifetch's dependency injection settings to use our classes and config.
 CookbookOmnifetch.configure do |c|
   c.cache_path = File.expand_path('~/.chefdk/cache')

data/lib/chef-dk/cookbook_profiler/identifiers.rb

@@ -23,10 +23,10 @@ module ChefDK
   module CookbookProfiler
     class Identifiers
 
-      attr_reader :cookbook_path
+      attr_reader :cookbook_version
 
-      def initialize(cookbook_path)
-        @cookbook_path = cookbook_path
+      def initialize(cookbook_version)
+        @cookbook_version = cookbook_version
       end
 
       def semver_version
@@ -62,18 +62,6 @@ module ChefDK
         @files ||= cookbook_version.manifest_records_by_path
       end
 
-      def cookbook_version
-        @cookbook_version ||= cookbook_loader.cookbook_version
-      end
-
-      def cookbook_loader
-        @cookbook_loader ||=
-          begin
-            loader = Chef::Cookbook::CookbookVersionLoader.new(cookbook_path)
-            loader.load_cookbooks
-            loader
-          end
-      end
     end
   end
 end

data/lib/chef-dk/exceptions.rb

@@ -26,6 +26,18 @@ module ChefDK
   class MalformedCookbook < StandardError
   end
 
+  class DependencyConflict < StandardError
+  end
+
+  class CookbookNotInWorkingSet < DependencyConflict
+  end
+
+  class InvalidCookbookLockData < StandardError
+  end
+
+  class CachedCookbookModified < StandardError
+  end
+
   class MissingComponentError < RuntimeError
     def initialize(component_name)
       super("Component #{component_name} is missing.")
@@ -43,4 +55,7 @@ module ChefDK
 
   class PolicyfileError < StandardError
   end
+
+  class MissingCookbookLockData < StandardError
+  end
 end

data/lib/chef-dk/generator.rb

@@ -19,22 +19,11 @@ module ChefDK
 
   module Generator
 
+    # This is here to hold attr_accessor data for Generator context variables
     class Context
-
-      attr_accessor :have_git
-
-      attr_accessor :app_root
-      attr_accessor :cookbook_root
-      attr_accessor :app_name
-      attr_accessor :cookbook_name
-      attr_accessor :new_file_basename
-      attr_accessor :content_source
-      attr_accessor :author_name
-      attr_accessor :author_email
-      attr_accessor :license_description
-      attr_accessor :license_text
-
-      attr_accessor :skip_git_init
+      def self.add_attr(name)
+        attr_accessor(name)
+      end
     end
 
     def self.reset
@@ -45,6 +34,13 @@ module ChefDK
       @context ||= Context.new
     end
 
+    def self.add_attr_to_context(name, value=nil)
+      sym_name = name.to_sym
+      ChefDK::Generator::Context.add_attr(sym_name)
+      ChefDK::Generator::TemplateHelper.delegate_to_app_context(sym_name)
+      context.public_send("#{sym_name}=", value)
+    end
+
     module TemplateHelper
 
       def self.delegate_to_app_context(name)
@@ -53,17 +49,98 @@ module ChefDK
         end
       end
 
-      # delegate all the attributes of app_config
-      delegate_to_app_context :app_root
-      delegate_to_app_context :cookbook_root
-      delegate_to_app_context :cookbook_name
-      delegate_to_app_context :new_file_basename
-      delegate_to_app_context :content_source
-      delegate_to_app_context :author_name
-      delegate_to_app_context :author_email
-      delegate_to_app_context :license_description
-      delegate_to_app_context :license_text
+      def year
+        Time.now.year
+      end
+
+      # Prints the short description of the license, suitable for use in a
+      # preamble to a file. Optionally specify a comment to prepend to each line.
+      def license_description(comment=nil)
+        case license
+        when 'all_rights'
+          result = "Copyright (c) #{year} #{copyright_holder}, All Rights Reserved."
+        when 'apache2'
+          result = <<-EOH
+Copyright #{year} #{copyright_holder}
+
+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.
+EOH
+        when 'mit'
+          result = <<-EOH
+The MIT License (MIT)
+
+Copyright (c) #{year} #{copyright_holder}
 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+EOH
+        when 'gplv2'
+          result = <<-EOH
+Copyright (C) #{year}  #{copyright_holder}
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+EOH
+        when 'gplv3'
+          result = <<-EOH
+Copyright (C) #{year}  #{copyright_holder}
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+EOH
+        end
+        if comment
+          result.gsub(/^/m, "#{comment} ")
+        else
+          result
+        end
+      end
     end
 
   end