kitchen-itamae 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed0e3eca7d4f48b6b1d726cd2ea73d95f272f83
-  data.tar.gz: 3709e5f151b761b8bb740c647364e57fa197c3ec
+  metadata.gz: 669a8e5d3ca1d9f48b8e6a435ce6d1083ff490e8
+  data.tar.gz: f38e2e8ed3d1f5f0ec3b4691cf79d7d6e64f1cfc
 SHA512:
-  metadata.gz: 584d45d4b5275394fd83427072762c895a965f484a0b0f44f0888f6e0f0d3f17e7751b9187bbbc1d79c670d4f7b58698a98202f757645ed2c6488efbddba7f8d
-  data.tar.gz: e1b5dcaea6e14b924ef50c36e32436e19cb421ee43d17063a3be43dc92af531b15e5d2bbdc0b16937d7cc22b881e001eb8ceba97f05b0d9b2a1239ef5fe77c31
+  metadata.gz: d554f62fd74b75fcecee83823febec9f70ead48ae93b44fab1c26b6fc9fa3a721fda74ffde3b00c750ebb7df419427caeda9abe3791c70372b15a33288670511
+  data.tar.gz: 1127b6a9f46d6a345ced9bc16588ecdb86c8a23cb8c6970591c9822b65bb92a309309422438ef21e092b6a26e9824e6a1c659bd3f779d077ea62a9909c3632a7

data/.rspec

@@ -0,0 +1 @@
+--format documentation

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 CHANGELOG of Itamae::Kitchen
 
+## 0.2.4
+
+- Compati: include chef_helper as string
+    - for test-kitchen 1.4.0
+    - It is tempolaly imprement.
+
 ## 0.2.3
 
 - Bug: Clash on centos6 with Gemfile.

data/Guardfile

@@ -0,0 +1,77 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.("routing/#{m[1]}_routing"),
+      rspec.spec.("controllers/#{m[1]}_controller"),
+      rspec.spec.("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end

data/kitchen-itamae.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "guard-rspec"
 end

data/lib/kitchen-itamae/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Itamae
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/lib/kitchen/provisioner/itamae.rb

@@ -97,9 +97,34 @@ module Kitchen
       end
 
       def chef_helpers
-        IO.read(
-          Gem.find_files_from_load_path('../support/chef_helpers.sh').first
-        )
+        # test-kitchen removes chef_helper at 1.4.0.
+        # It is tempolaly imprement.
+        <<-CHEF_HELPER
+          should_update_chef() {
+            if test ! -d "$1" ; then return 0
+            elif test "$2" = "true" ; then return 1
+            elif test "$2" = "latest" ; then return 0
+            fi
+
+            local version="`$1/bin/chef-solo -v | cut -d " " -f 2`"
+
+            echo "$version" | grep "^$2" 2>&1 >/dev/null
+            if test $? -eq 0 ; then
+              return 1
+            else
+              return 0
+            fi
+          }
+
+          should_update_chef "$chef_omnibus_root" "$version"
+          if test $? -eq 0 ; then
+            echo "-----> Installing Chef Omnibus ($pretty_version)"
+            do_download "$chef_omnibus_url" /tmp/install.sh
+            $sudo_sh /tmp/install.sh $install_flags
+          else
+            echo "-----> Chef Omnibus installation detected ($pretty_version)"
+          fi
+        CHEF_HELPER
       end
 
       def chef_install_function

data/spec/kitchen/provisioner/itamae_spec.rb

@@ -0,0 +1,104 @@
+require_relative '../../spec_helper'
+require 'kitchen'
+
+require 'kitchen/provisioner/itamae'
+
+describe Kitchen::Provisioner::Itamae do
+  let(:logger) { Logger.new(nil) }
+
+  let(:provisioner) do
+    Kitchen::Provisioner::Itamae.new(config).finalize_config!(instance)
+  end
+
+  let(:suite) do
+    double(name: "test-default")
+  end
+
+  let(:instance) do
+    double(name: "itamae_node", logger: logger, suite: suite)
+  end
+
+  let(:config) do
+    { test_base_path: "/basist", kitchen_root: "/rooty", itamae_root: 'kitchen'  }
+  end
+
+  describe Kitchen::Provisioner::Itamae, "prepare_command" do
+    it "returns nil prepare_command with default configration" do
+      expect(provisioner.prepare_command).to be_nil
+    end
+
+    context "with Gemfile" do
+      it "returns bundler prepare_command" do
+        allow(File).to receive(:exists?).with(
+          File.join(config[:kitchen_root], config[:itamae_root], 'Gemfile')
+        ).and_return(true)
+        expect(provisioner.prepare_command).to match regexify("bundle config shebang", :partial_line)
+        expect(provisioner.prepare_command).to match regexify("bundle install --binstubs", :partial_line)
+      end
+    end
+  end
+
+  describe Kitchen::Provisioner::Itamae, "run_command" do
+    it "returns run_command with recipe" do
+      config[:run_list] = %w[tamatama itaita]
+      expect(provisioner.run_command).to match regexify("tamatama.rb", :partial_line)
+      expect(provisioner.run_command).to match regexify("itaita.rb", :partial_line)
+    end
+
+    context "with Gemfile" do
+      it "returns bundler run_command" do
+        config[:run_list] = %w[tamatama itaita]
+        config[:use_bundler] = true
+        allow(File).to receive(:exists?).with(
+          File.join(config[:kitchen_root], config[:itamae_root], 'Gemfile')
+        ).and_return(true)
+        expect(provisioner.run_command).to match regexify("export PATH=", :partial_line)
+        expect(provisioner.run_command).to match regexify("tamatama.rb", :partial_line)
+        expect(provisioner.run_command).to match regexify("itaita.rb", :partial_line)
+      end
+    end
+  end
+
+  describe Kitchen::Provisioner::Itamae, "prepare_json" do
+    before do
+      @root = Dir.mktmpdir
+      config[:kitchen_root] = @root
+    end
+
+    after do
+      FileUtils.remove_entry(@root)
+      begin
+        provisioner.cleanup_sandbox
+      rescue # rubocop:disable Lint/HandleExceptions
+      end
+    end
+
+    let(:attrs) do
+      JSON.parse(File.read(File.join(provisioner.sandbox_path, 'dna.json')))
+    end
+
+    it "creates dna.json to sandbox_path" do
+      provisioner.create_sandbox
+      provisioner.send(:prepare_json)
+      expect(attrs).to be_empty
+    end
+
+    context "with Attributes" do
+      it "creates dna.json with attributes" do
+        config[:attributes] = {
+          key: "value"
+        }
+        provisioner.create_sandbox
+        provisioner.send(:prepare_json)
+        expect(attrs['key']).to eq "value"
+      end
+    end
+  end
+
+  # see spec/provisioner/shell_spec
+  def regexify(str, line = :whole_line)
+    r = Regexp.escape(str)
+    r = "^\s*#{r}$" if line == :whole_line
+    Regexp.new(r)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rspec'
+
+RSpec.configure do |config|
+  config.tty = true
+  config.color = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-itamae
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: itamae provisioner for test-kitchen
 email:
 - sawanoboriyu@higanworks.com
@@ -60,14 +88,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - kitchen-itamae.gemspec
 - lib/kitchen-itamae/version.rb
 - lib/kitchen/provisioner/itamae.rb
+- spec/kitchen/provisioner/itamae_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/OpsRockin/kitchen-itamae
 licenses:
 - apache2
@@ -88,9 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: itamae provisioner for test-kitchen
-test_files: []
-has_rdoc: 
+test_files:
+- spec/kitchen/provisioner/itamae_spec.rb
+- spec/spec_helper.rb