chef-dk 0.13.21 → 0.14.25

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

@@ -77,17 +77,17 @@ module ChefDK
       #
       add_component "berkshelf" do |c|
         c.gem_base_dir = "berkshelf"
-        # For berks the real command to run is "#{bin("bundle")} exec thor spec:ci"
+        # For berks the real command to run is "#{embedded_bin("bundle")} exec thor spec:ci"
         # We can't run it right now since graphviz specs are included in the
         # test suite by default. We will be able to switch to that command when/if
         # Graphviz is added to omnibus.
         c.unit_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec #{bin("rspec")} --color --format progress spec/unit --tag ~graphviz")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec #{embedded_bin("rspec")} --color --format progress spec/unit --tag ~graphviz")
         end
         c.integration_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec #{bin("cucumber")} --color --format progress --tags ~@no_run --tags ~@spawn --tags ~@graphviz --strict")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec #{embedded_bin("cucumber")} --color --format progress --tags ~@no_run --tags ~@spawn --tags ~@graphviz --strict")
         end
 
         c.smoke_test do
@@ -101,12 +101,12 @@ module ChefDK
       add_component "test-kitchen" do |c|
         c.gem_base_dir = "test-kitchen"
         c.unit_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec rake unit")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec rake unit")
         end
         c.integration_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec rake features")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec rake features")
         end
 
         # NOTE: By default, kitchen tries to be helpful and install a driver
@@ -157,12 +157,12 @@ KITCHEN_YML
       add_component "chef-client" do |c|
         c.gem_base_dir = "chef"
         c.unit_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec #{bin("rspec")} -fp -t '~volatile_from_verify' spec/unit")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec #{embedded_bin("rspec")} -fp -t '~volatile_from_verify' spec/unit")
         end
         c.integration_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec #{bin("rspec")} -fp spec/integration spec/functional")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec #{embedded_bin("rspec")} -fp spec/integration spec/functional")
         end
 
         c.smoke_test do
@@ -176,8 +176,8 @@ KITCHEN_YML
       add_component "chef-dk" do |c|
         c.gem_base_dir = "chef-dk"
         c.unit_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec #{bin("rspec")}")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec #{embedded_bin("rspec")}")
         end
         c.smoke_test do
           run_in_tmpdir("#{bin("chef")} generate cookbook example")
@@ -263,7 +263,7 @@ EOS
               end
 
               result = bundle_install_mutex.synchronize do
-                sh("#{bin("bundle")} install --local --quiet", cwd: cwd, env: {"BUNDLE_GEMFILE" => gemfile })
+                sh("#{embedded_bin("bundle")} install --local --quiet", cwd: cwd, env: {"BUNDLE_GEMFILE" => gemfile })
               end
 
               if result.exitstatus != 0
@@ -281,11 +281,12 @@ EOS
         end
       end
 
+
       add_component "chefspec" do |c|
         c.gem_base_dir = "chefspec"
         c.unit_test do
-          bundle_install_mutex.synchronize { sh("#{bin("bundle")} install") }
-          sh("#{bin("bundle")} exec #{bin("rake")} unit")
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec #{embedded_bin("rake")} unit")
         end
         c.smoke_test do
           tmpdir do |cwd|
@@ -307,7 +308,7 @@ end
 require 'spec_helper'
               EOF
             end
-            sh(bin("rspec"), cwd: cwd)
+            sh(embedded_bin("rspec"), cwd: cwd)
           end
         end
       end
@@ -319,7 +320,7 @@ require 'spec_helper'
           tmpdir do |cwd|
             sh("#{bin("chef")} generate cookbook example", cwd: cwd)
             cb_cwd = File.join(cwd, "example")
-            sh(bin("rspec"), cwd: cb_cwd)
+            sh(embedded_bin("rspec"), cwd: cb_cwd)
           end
         end
       end
@@ -335,14 +336,14 @@ def foo
 end
               EOF
             end
-            sh("#{bin("rubocop")} foo.rb -l", cwd: cwd)
+            sh("#{embedded_bin("rubocop")} foo.rb -l", cwd: cwd)
           end
         end
       end
 
       add_component "fauxhai" do |c|
         c.gem_base_dir = "fauxhai"
-        c.smoke_test { sh("#{bin("gem")} list fauxhai") }
+        c.smoke_test { sh("#{embedded_bin("gem")} list fauxhai") }
       end
 
       add_component "knife-spork" do |c|
@@ -353,7 +354,7 @@ end
       add_component "kitchen-vagrant" do |c|
         c.gem_base_dir = "kitchen-vagrant"
         # The build is not passing in travis, so no tests
-        c.smoke_test { sh("#{bin("gem")} list kitchen-vagrant") }
+        c.smoke_test { sh("#{embedded_bin("gem")} list kitchen-vagrant") }
       end
 
       add_component "package installation" do |c|
@@ -364,11 +365,10 @@ end
 
           if File.directory?(usr_bin_prefix)
             sh!("#{usr_bin_path("berks")} -v")
-
             sh!("#{usr_bin_path("chef")} -v")
-
             sh!("#{usr_bin_path("chef-client")} -v")
             sh!("#{usr_bin_path("chef-solo")} -v")
+            sh!("#{usr_bin_path("delivery")} -V") unless Chef::Platform.windows?
 
             # In `knife`, `knife -v` follows a different code path that skips
             # command/plugin loading; `knife -h` loads commands and plugins, but
@@ -386,7 +386,6 @@ end
             end
 
             sh!("#{usr_bin_path("ohai")} -v")
-
             sh!("#{usr_bin_path("foodcritic")} -V")
           end
 
@@ -426,9 +425,9 @@ end
 
         # Commenting out the unit and integration tests for now until we figure
         # out the bundler error
-        #c.unit_test { sh("#{bin("bundle")} exec rake test:isolated") }
+        #c.unit_test { sh("#{embedded_bin("bundle")} exec rake test:isolated") }
         # This runs Test Kitchen (using kitchen-inspec) with some inspec tests
-        #c.integration_test { sh("#{bin("bundle")} exec rake test:vm") }
+        #c.integration_test { sh("#{embedded_bin("bundle")} exec rake test:vm") }
 
         # It would be nice to use a chef generator to create these specs, but
         # we dont have that yet.  So we do it manually.
@@ -447,11 +446,89 @@ end
               INSPEC_TEST
             end
             # TODO when we appbundle inspec, no longer `chef exec`
-            sh("#{bin("chef")} exec #{bin("inspec")} exec .", cwd: cwd)
+            sh("#{bin("chef")} exec #{embedded_bin("inspec")} exec .", cwd: cwd)
+          end
+        end
+      end
+
+      unless Chef::Platform.windows?
+        add_component "delivery-cli" do |c|
+          # We'll want to come back and revisit getting unit tests added -
+          # currently running the tests depends on cargo , which is not included
+          # in our package.
+          c.base_dir = "bin"
+          c.smoke_test do
+            tmpdir do |cwd|
+              sh!("delivery setup --user=shipit --server=delivery.shipit.io --ent=chef --org=squirrels", cwd: cwd)
+            end
           end
         end
       end
 
+      add_component "git" do |c|
+        c.base_dir = "embedded/bin"
+        c.smoke_test do
+	  tmpdir do |cwd|
+            sh!("#{embedded_bin("git")} config -l")
+	    sh!("#{embedded_bin("git")} clone https://github.com/chef/chef-provisioning", cwd: cwd)
+
+	    # # If /usr/bin/git is a symlink, fail the test.
+	    # # Note that this test cannot go last because it does not return a
+	    # # Mixlib::Shellout object in the windows case, which will break the tests.
+	    unless Chef::Platform.windows?
+             failure_str = "#{nix_platform_native_bin_dir}/git contains a symlink which might mean we accidentally overwrote system git via chefdk."
+             result = sh("readlink #{nix_platform_native_bin_dir}/git")
+             # if a symlink was found, test to see if it is in a chefdk install
+             if result.status.exitstatus == 0
+               raise failure_str if result.stdout =~ /chefdk/
+             end
+	    end
+
+	    # <chef_dk>/bin/ should not contain a git binary.
+	    failure_str = "`<chef_dk>/bin/git --help` should fail as git should be installed in embedded/bin"
+	    fail_if_exit_zero(bin("git --help"), failure_str)
+	  end
+        end
+      end
+
+      add_component "opscode-pushy-client" do |c|
+        c.gem_base_dir = "opscode-pushy-client"
+        # TODO the unit tests are currently failing in master
+        # c.unit_test do
+        #   bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+        #   sh("#{embedded_bin("bundle")} exec rake spec")
+        # end
+
+        c.smoke_test do
+          tmpdir do |cwd|
+            sh("#{bin("pushy-client")} -v", cwd: cwd)
+          end
+        end
+      end
+
+      # We try and use some chef-sugar code to make sure it loads correctly
+      add_component "chef-sugar" do |c|
+        c.gem_base_dir = "chef-sugar"
+        c.smoke_test do
+          tmpdir do |cwd|
+            with_file(File.join(cwd, 'foo.rb')) do |f|
+              f.write <<-EOF
+require 'chef/sugar'
+log 'something' do
+  not_if  { _64_bit? }
+end
+              EOF
+            end
+            sh("chef-apply foo.rb", cwd: cwd)
+          end
+        end
+      end
+
+      add_component "knife-supermarket" do |c|
+        c.gem_base_dir = "knife-supermarket"
+        c.smoke_test { sh("#{bin("knife")} supermarket search httpd")}
+      end
+
       attr_reader :verification_threads
       attr_reader :verification_results
       attr_reader :verification_status

data/lib/chef-dk/completions/bash.sh.erb

@@ -1,5 +1,5 @@
-_chef_comp() {
-    local COMMANDS="<%= commands.keys.join(' ')-%>"
-    COMPREPLY=($(compgen -W "$COMMANDS" -- ${COMP_WORDS[COMP_CWORD]} ))
-}
-complete -F _chef_comp chef
+_chef_comp() {
+    local COMMANDS="<%= commands.keys.join(' ')-%>"
+    COMPREPLY=($(compgen -W "$COMMANDS" -- ${COMP_WORDS[COMP_CWORD]} ))
+}
+complete -F _chef_comp chef

data/lib/chef-dk/completions/chef.fish.erb

@@ -1,10 +1,10 @@
-# Fish Shell command-line completions for ChefDK
-
-function __fish_chef_no_command --description 'Test if chef has yet to be given the main command'
-  set -l cmd (commandline -opc)
-  test (count $cmd) -eq 1
-end
-
-<% commands.each do |command, desc| -%>
-complete -c chef -f -n '__fish_chef_no_command' -a <%= command %> -d "<%= desc %>"
-<% end -%>
+# Fish Shell command-line completions for ChefDK
+
+function __fish_chef_no_command --description 'Test if chef has yet to be given the main command'
+  set -l cmd (commandline -opc)
+  test (count $cmd) -eq 1
+end
+
+<% commands.each do |command, desc| -%>
+complete -c chef -f -n '__fish_chef_no_command' -a <%= command %> -d "<%= desc %>"
+<% end -%>

data/lib/chef-dk/completions/zsh.zsh.erb

@@ -1,21 +1,21 @@
-function _chef() {
-
-  local -a _1st_arguments
-  _1st_arguments=(
-  <% commands.each do |command, desc| -%>
-    '<%=command%>:<%=desc%>'
-  <% end -%>
-  )
-
-  _arguments \
-    '(-v --version)'{-v,--version}'[version information]' \
-    '*:: :->subcmds' && return 0
-
-  if (( CURRENT == 1 )); then
-    _describe -t commands "chef subcommand" _1st_arguments
-    return
-  fi
-}
-
-compdef _chef chef
-
+function _chef() {
+
+  local -a _1st_arguments
+  _1st_arguments=(
+  <% commands.each do |command, desc| -%>
+    '<%=command%>:<%=desc%>'
+  <% end -%>
+  )
+
+  _arguments \
+    '(-v --version)'{-v,--version}'[version information]' \
+    '*:: :->subcmds' && return 0
+
+  if (( CURRENT == 1 )); then
+    _describe -t commands "chef subcommand" _1st_arguments
+    return
+  fi
+}
+
+compdef _chef chef
+

data/lib/chef-dk/component_test.rb

@@ -100,6 +100,10 @@ module ChefDK
     end
 
     def bin(binary)
+      File.join(omnibus_bin_dir, binary)
+    end
+
+    def embedded_bin(binary)
       File.join(omnibus_embedded_bin_dir, binary)
     end
 
@@ -124,6 +128,31 @@ module ChefDK
       sh(*args).tap { |result| result.error! }
     end
 
+    # Run a command, if the command returns zero, raise an error,
+    # otherwise, if it returns non-zero or doesn't exist,
+    # return a passing command so that the test parser doesn't
+    # crash.
+    def fail_if_exit_zero(cmd_string, failure_string='')
+      result = sh(cmd_string)
+      if result.status.exitstatus == 0
+	raise failure_string
+      else
+	sh('true')
+      end
+    rescue Errno::ENOENT
+      sh('true')
+    end
+
+    def nix_platform_native_bin_dir
+      if /sunos|solaris/ =~ RUBY_PLATFORM
+        "/opt/local/bin"
+      elsif /darwin/ =~ RUBY_PLATFORM
+        "/usr/local/bin"
+      else
+        "/usr/bin"
+      end
+    end
+
     def run_in_tmpdir(command, options={})
       tmpdir do |dir|
         options[:cwd] = dir
@@ -159,7 +188,7 @@ module ChefDK
 
     def component_path
       if base_dir
-        File.join(omnibus_apps_dir, base_dir)
+        File.join(omnibus_root, base_dir)
       elsif gem_base_dir
         gem_base_dir
       else

data/lib/chef-dk/configurable.rb

@@ -1,69 +1,69 @@
-#
-# 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/config'
-require 'chef/workstation_config_loader'
-
-# Define a config context for ChefDK
-class Chef::Config
-
-  default(:policy_document_native_api, true)
-
-  config_context(:chefdk) do
-
-    # Error when we encounter unknown keys. This makes it clear to the user if
-    # they get the name of the config key wrong (e.g., `chefdk.generator`
-    # instead of `chefdk.generator_cookbook`).
-    config_strict_mode(true)
-
-    default(:generator_cookbook, File.expand_path("../skeletons/code_generator", __FILE__))
-
-    config_context(:generator) do
-      config_strict_mode(true)
-      configurable :copyright_holder
-      configurable :email
-      configurable :license
-    end
-  end
-end
-
-module ChefDK
-  module Configurable
-
-    def chef_config
-      return @chef_config if @chef_config
-      config_loader.load
-      @chef_config = Chef::Config
-    end
-
-    def chefdk_config
-      chef_config.chefdk
-    end
-
-    def config_loader
-      @config_loader ||= Chef::WorkstationConfigLoader.new(config[:config_file])
-    end
-
-    def generator_config
-      chefdk_config.generator
-    end
-
-    def knife_config
-      chef_config.knife
-    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/config'
+require 'chef/workstation_config_loader'
+
+# Define a config context for ChefDK
+class Chef::Config
+
+  default(:policy_document_native_api, true)
+
+  config_context(:chefdk) do
+
+    # Error when we encounter unknown keys. This makes it clear to the user if
+    # they get the name of the config key wrong (e.g., `chefdk.generator`
+    # instead of `chefdk.generator_cookbook`).
+    config_strict_mode(true)
+
+    default(:generator_cookbook, File.expand_path("../skeletons/code_generator", __FILE__))
+
+    config_context(:generator) do
+      config_strict_mode(true)
+      configurable :copyright_holder
+      configurable :email
+      configurable :license
+    end
+  end
+end
+
+module ChefDK
+  module Configurable
+
+    def chef_config
+      return @chef_config if @chef_config
+      config_loader.load
+      @chef_config = Chef::Config
+    end
+
+    def chefdk_config
+      chef_config.chefdk
+    end
+
+    def config_loader
+      @config_loader ||= Chef::WorkstationConfigLoader.new(config[:config_file])
+    end
+
+    def generator_config
+      chefdk_config.generator
+    end
+
+    def knife_config
+      chef_config.knife
+    end
+  end
+end