kondate 0.4.15 → 0.5.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0ac22d810f77ed1c124e0a5ca44fd2cfad3f69c7
-  data.tar.gz: d12c0af4905dd9484565f627b2b4b2c33c82488f
+SHA256:
+  metadata.gz: d582ca92c0673516338ad04d23c7199f8c7b297ebc0749d8dced87d6a62fdada
+  data.tar.gz: 50de0a1fccc9742723f6b666024afcc307694b4411ef372ac3e8d3597a444051
 SHA512:
-  metadata.gz: ead654f8988ba341765a80cfcaa64501d9be1ca010635aceee641112cbd1b8bc95430382e0c07b520aba5681c33a9460870ef0aeec5fac5b63a4c367b8875991
-  data.tar.gz: 0e2d4a1a53eb22c2ae848f7f7dda78c869535ff5cc6ceaf5efba29ee1296ce929bedc7311468e58cf94834207186e8cf1a10c019f8468dd48c6a9292c1e8bcc9
+  metadata.gz: 186572e357a561fc3e237e988bf5227bc932002fb746e68eb5197513809b6e21b2a4bd287b1e10872cd810730d022b2cdb1ceec9713cd30f4d9860707d7a4f30
+  data.tar.gz: dc2c5a0b2d34548b6bca5582087c43182ebb27703658a967e0009cb2c280b33d4c15976b0fd83d112cb7f30c32c784610f525f2c738ce7272571c092faac2539

data/.gitignore

@@ -19,3 +19,4 @@
 .vagrant
 .tags
 /bin/
+/vendor/

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.5.0 (To be released)
+
+Enhancements:
+
+* Support --shell option of itamae
+* Support --login-shell option of itamae
+* Make configurable itamae-kondate and serverspec-kondate options on .kondate.conf
+
 # 0.4.15 (2018-02-01)
 
 Changes:

data/README.md

@@ -115,6 +115,29 @@ host_plugin:
 
 You can customize the directory tree with this conf.
 
+#### Itamae options
+
+You can configure itamae-kondate options on .kondate.conf, too as:
+
+```
+itamae_options:
+  shell: /bin/bash
+```
+
+See `itamae-kondate --help` for option list.
+
+#### Serverspec options
+
+You can configure serversepc-kondate options on .kondate.conf, too as:
+
+```
+itamae_options:
+  vagrant: true
+```
+
+See `serverspec-kondate --help` for option list.
+
+
 ### hosts.yml
 
 The default uses `file` host plugin, and `hosts.yml`. The contents of `hosts.yml` look like below:

data/lib/kondate/cli.rb

@@ -57,6 +57,8 @@ module Kondate
     option :vagrant,                     :type => :boolean, :default => false
     option :profile,                     :type => :string,  :default => nil, :desc => "[EXPERIMENTAL] Save profiling data", :banner => "PATH"
     option :recipe_graph,                :type => :string,  :default => nil, :desc => "[EXPERIMENTAL] Write recipe dependency graph in DOT", :banner => "PATH"
+    option :shell,                       :type => :string,  :default => Config.itamae_options[:shell] || "/bin/sh"
+    option :login_shell,                 :type => :boolean, :default => false
     def itamae(host)
       with_host(host) {|property_files| do_itamae(host, property_files) }
     end
@@ -70,6 +72,8 @@ module Kondate
     option :profile,                      :type => :string,  :default => nil, :desc => "[EXPERIMENTAL] Save profiling data", :banner => "PATH"
     option :recipe_graph,                 :type => :string,  :default => nil, :desc => "[EXPERIMENTAL] Write recipe dependency graph in DOT", :banner => "PATH"
     option :parallel, :aliases => ["-p"], :type => :numeric, :default => processor_count
+    option :shell,                        :type => :string,  :default => Config.itamae_options[:shell] || "/bin/sh"
+    option :login_shell,                  :type => :boolean, :default => false
     def itamae_role(role)
       with_role(role) {|host, property_files| do_itamae(host, property_files) }
     end
@@ -97,6 +101,14 @@ module Kondate
 
     private
 
+    def itamae_options
+      @itamae_options ||= Config.itamae_options.merge(@options)
+    end
+
+    def serverspec_options
+      @serverspec_options ||= Config.serverspec_options.merge(@options)
+    end
+
     def with_host(host, &block)
       property_files = build_property_files(host)
       begin
@@ -111,7 +123,7 @@ module Kondate
 
     def with_role(role, &block)
       $stdout.puts "Number of parallels is #{@options[:parallel]}"
-      hosts = Kondate::Config.host_plugin.get_hosts(role)
+      hosts = Config.host_plugin.get_hosts(role)
       if hosts.nil? or hosts.empty?
         $stderr.puts 'No host'
         exit(1)
@@ -142,7 +154,7 @@ module Kondate
 
         properties = property_file.load
 
-        if @options[:vagrant]
+        if itamae_options[:vagrant]
           command << " --vagrant"
         else
           # itamae itself sees Net:SSH::Config.for(host)
@@ -155,10 +167,12 @@ module Kondate
         end
 
         command << " -y #{property_file.path}"
-        command << " -l=debug" if @options[:debug]
-        command << " --dry-run" if @options[:dry_run]
-        command << " --profile=#{@options[:profile]}" if @options[:profile]
-        command << " --recipe-graph=#{@options[:recipe_graph]}" if @options[:recipe_graph]
+        command << " -l=debug" if itamae_options[:debug]
+        command << " --dry-run" if itamae_options[:dry_run]
+        command << " --profile=#{itamae_options[:profile]}" if itamae_options[:profile]
+        command << " --recipe-graph=#{itamae_options[:recipe_graph]}" if itamae_options[:recipe_graph]
+        command << " --shell=#{itamae_options[:shell]}" if itamae_options[:shell]
+        command << " --login-shell" if itamae_options[:login_shell]
         command << " bootstrap.rb"
         $stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
 
@@ -169,7 +183,7 @@ module Kondate
 
     def do_serverspec(host, property_files)
       env = {}
-      env['TARGET_VAGRANT'] = '1' if @options[:vagrant]
+      env['TARGET_VAGRANT'] = '1' if serverspec_options[:vagrant]
       env['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/serverspec/kondate"
       property_files.each do |role, property_file|
         next if property_file.empty?

data/lib/kondate/config.rb

@@ -33,6 +33,14 @@ module Kondate
         @config_path ||= opts[:config] || ENV['KONDATE_CONFIG_PATH'] || DEFAULT_CONFIG_PATH
       end
 
+      def itamae_options
+        @itamae_options ||= Thor::CoreExt::HashWithIndifferentAccess.new(config[:itamae_options] || {})
+      end
+
+      def serverspec_options
+        @serverspec_options ||= Thor::CoreExt::HashWithIndifferentAccess.new(config[:serverspec_options] || {})
+      end
+
       def kondate_directories
         {
           'middleware_recipes_dir' => middleware_recipes_dir,

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.4.15"
+  VERSION = "0.5.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.5.0.pre1
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -199,12 +199,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Kondate is yet another nodes management framework for Itamae/Serverspec.