kondate 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9cce6830f15dbb3ee4856a3d0c789b23ad2a615
-  data.tar.gz: b891c2c1d573bd93672453ad93b1a94a01770370
+  metadata.gz: 872d487f03a83e112bc7025bd7cf90a4d4f5f457
+  data.tar.gz: 35fc66dbe8261daf3cca13463dcb5594e4ea8711
 SHA512:
-  metadata.gz: c342ae98969f5f2ae78579d9bc52b1b8d89ed79d68f8ebbdb2f98b9ae61c4cd2bfb37fc13bcaa64f8f4c6ddf560eef88ba921b0c170205224f757eac5dc3dd08
-  data.tar.gz: 6b1e8f7b907218e6c9aaded19ba8dbc66040c857b0aea9eae3b3844475d256df3fb96f49f335c56bda63aa554af5491093df5f7fc811ececbf5d1bf723fe3149
+  metadata.gz: 17f4e2f7ec928b35574819abf608cacb6627aa0db7aada34db129889e7c9e86c17c82cf955fffa52319fb6d8fe3177d078414ddf1b0703cecba3330f32be6695
+  data.tar.gz: 4af4298871810ab4c02f5ac423c1b097fd4f5e53bf6b5ec096af07c4af536a1e036470aaa5b1bc303146bf8a29ea189eb5e062bbb41ceaf7131984e555702e5a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.5 (2015-11-30)
+
+Changes:
+
+* Add --vagrant option, and stop judging vagrant or not via host name
+
 # 0.1.4 (2015-11-29)
 
 Changes:

data/README.md

@@ -236,7 +236,23 @@ set :host, ENV['TARGET_HOST']
 set :set_property, YAML.load_file(ENV['TARGET_NODE_FILE'])
 ```
 
-because these ENVs are passed by `kondate serverspec`. 
+because these ENVs are passed by `kondate serverspec`.
+
+Configuring following lines for vagrant is also recommended:
+
+```
+  if ENV['TARGET_VAGRANT']
+    `vagrant up #{host}`
+
+    config = Tempfile.new('', Dir.tmpdir)
+    config.write(`vagrant ssh-config #{host}`)
+    config.close
+
+    Net::SSH::Config.for(host, [config.path])
+  else
+```
+
+`ENV['TARGET_VAGRANT']` is turned on if `kondate serverspec` is executed with `--vagrant` option.
 
 See [templates/spec/spec_helper.rb](./lib/kondate/templates/spec/spec_helper.rb) for an example.
 
@@ -246,16 +262,22 @@ The default reads `hosts.yml` to resolve roles of a host, but
 you may want to resolve roles from AWS EC2 `roles` tag, or
 you may want to resolve roles from your own host resolver API application.
 
-Thus, `kondate` provides a plugin system to reolve hosts' roles.
+Thus, `kondate` provides a plugin system to resolve hosts' roles.
 
 ### Naming Convention
 
 You must follow the below naming conventions:
 
-* gem name: kondate-host_plugin-xxx (xxx_yyy)
+* gem name: kondate-host_plugin-xxx (xxx_yyy) (if you want to make a gem)
 * file name: lib/kondate/host_plugin/xxx.rb (xxx_yyy.rb)
 * class name: Kondate::HostPlugin::Xxx (XxxYyy)
 
+If you want to put your own host plugin locally without publishing a gem, you can configure the location with .kondate.conf as:
+
+```
+plugin_dir: lib
+```
+
 ### Interface
 
 What you have to implement are `#initialize`, `#get_environment`, and `#get_roles` methods. Here is an example of file plugin:
@@ -313,8 +335,8 @@ vagrant up
 ```
 
 ```
-bundle exec exe/kondate itamae vagrant-centos --role sample
-bundle exec exe/kondate serverspec vagrant-centos --role sample
+bundle exec exe/kondate itamae vagrant-centos --vagrant --role sample
+bundle exec exe/kondate serverspec vagrant-centos --vagrant --role sample
 ```
 
 ## ToDo

data/lib/kondate/cli.rb

@@ -51,6 +51,7 @@ module Kondate
     option :recipe,                      :type => :array,   :default => []
     option :debug,   :aliases => ["-d"], :type => :boolean, :default => false
     option :confirm,                     :type => :boolean, :default => true
+    option :vagrant,                     :type => :boolean, :default => false
     def itamae(host)
       builder, property_files = build_property_files(host)
 
@@ -62,7 +63,7 @@ module Kondate
 
         properties = YAML.load_file(property_file)
 
-        if builder.vagrant?
+        if @options[:vagrant]
           command << " --vagrant"
         else
           config = Net::SSH::Config.for(host)
@@ -85,10 +86,12 @@ module Kondate
     option :recipe,                      :type => :array,   :default => []
     option :debug,   :aliases => ["-d"], :type => :boolean, :default => false
     option :confirm,                     :type => :boolean, :default => true
+    option :vagrant,                     :type => :boolean, :default => false
     def serverspec(host)
       builder, property_files = build_property_files(host)
 
       ENV['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/serverspec/kondate"
+      ENV['TARGET_VAGRANT'] = '1' if @options[:vagrant]
       property_files.each do |role, property_file|
         RSpec::Core::RakeTask.new([host, role].join(':'), :recipe) do |t, args|
           ENV['TARGET_HOST'] = host

data/lib/kondate/property_builder.rb

@@ -122,9 +122,5 @@ module Kondate
         end.path
       end
     end
-
-    def vagrant?
-      %r{\Avagrant} === @host
-    end
   end
 end

data/lib/kondate/templates/hosts.yml

@@ -1,2 +1 @@
 localhost: [sample]
-vagrant-centos: [sample]

data/lib/kondate/templates/spec/spec_helper.rb

@@ -22,7 +22,7 @@ else
 end
 
 options =
-  if %r{\Avagrant} === host
+  if ENV['TARGET_VAGRANT']
     `vagrant up #{host}`
 
     config = Tempfile.new('', Dir.tmpdir)

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae