itamae-mitsurin 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 501496a4a667232eeeb4020024fb96d25dac514a
-  data.tar.gz: bfb410645c364d84f975ecc1e4aae10934920355
+  metadata.gz: eb10fdaf74906a17da6f88364c2fd758f20d35ab
+  data.tar.gz: e0a64acfc4099cc9a7bc4f35ab612abefe7d4cb4
 SHA512:
-  metadata.gz: af73678cf92dbc16f8353fe3635921ded6fa3ce1b622535983032a77e71b343285208a34636aa02080c59f8e3b30a812739835c72bbe505366d7db23889a3a78
-  data.tar.gz: 07f48d7d5393560061191d51dd7d079372c46a7a35344cf14671d81e904b57d76d01a0faec01a934affba32aaab9c9c70fd786f00486b1805984ada978837675
+  metadata.gz: 1aa4b406d867b1fc844bcdba2f096eb2decb1065f7c257f9da8522652ac39e37ef4c1fae1966a0536308ee3721a1b8cbc72614b2f1d0565e0ff952d0058790f4
+  data.tar.gz: 4454340317f8a0e1a905c7b3e3778a17909b06f1a60df20cc1dff3eadd4036d6f3f5d3464168098c5ae67636c9a7d365a6b3f2ea4cc07fcd7526dda4fd78acf9

data/lib/itamae/backend.rb

@@ -251,8 +251,12 @@ module Itamae
 
         if @options[:ask_password]
           print "password: "
-          password = STDIN.noecho(&:gets).strip
-          print "#{ENV['SSH_PASSWORD']}\n"
+          unless ENV['SSH_PASSWORD'].nil?
+            password = ENV['SSH_PASSWORD']
+          else
+            password = STDIN.noecho(&:gets).strip
+          end
+          print "\n"
           opts.merge!(password: password)
         end
 

data/lib/itamae/mitsurin/creators/templates/project/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'itamae-mitsurin'
+gem 'highline'

data/lib/itamae/mitsurin/creators/templates/project/site-cookbooks/_base/_base/recipes/default.rb

@@ -0,0 +1 @@
+puts " LOAD : Environment set is " << node[:environments][:set]

data/lib/itamae/mitsurin/creators/templates/project/site-cookbooks/_base/_base/spec/default_spec.rb

@@ -1,2 +1 @@
 require 'spec_helper'
-os

data/lib/itamae/mitsurin/creators/templates/project/spec/spec_helper.rb

@@ -23,9 +23,10 @@ attributes = JSON.parse(File.read(node_file), symbolize_names: true)
 set_property attributes
 
 options = Net::SSH::Config.for(host)
-options[:user] ||= Etc.getlogin
+options[:user] = ENV['SSH_USER']
 options[:password] = ENV['SSH_PASSWORD']
 options[:keys] = ENV['SSH_KEY']
+options[:port] = ENV['SSH_PORT']
 
 set :host, options[:host_name] || host
 set :shell, '/bin/bash'

data/lib/itamae/mitsurin/itamae_task.rb

@@ -102,7 +102,7 @@ module Itamae
                 exit 1
               end
 
-              # get recipe attr
+              # get recipes attr
               recipe_attr_file = []
               recipes.each do |recipe_h|
                 if recipe_h["#{recipe_h.keys.join}"].nil?
@@ -116,25 +116,25 @@ module Itamae
 
               recipe_attr_file.flatten!
 
-              # recipe attr other=env
+              # recipes attr other=env
               recipe_env_h_a = []
               recipe_attr_file.each do |file|
                 recipe_h = JSON.parse(File.read(file), symbolize_names: true)
                 recipe_env_h_a << recipe_h.deep_merge(env_h)
               end
 
-              # recipe attr other=recipes
+              # recipe attr other=recipes_env
               moto = recipe_env_h_a[0]
               recipe_env_h_a.each {|hash| moto.deep_merge!(hash)}
               recipe_env_h = moto
 
               if recipe_env_h.nil?
-                # node attr other=env
+                # env attr other=node
                 node_env_h = env_h.deep_merge(node_h)
                 node_env_j = jq node_env_h
                 write_json(bname) {|file| file.puts node_env_j}
               else
-                # node attr other=recipe_env
+                # recipe_env attr other=node
                 recipe_env_node_h = recipe_env_h.deep_merge(node_h)
                 recipe_env_node_j = jq recipe_env_node_h
                 write_json(bname) {|file| file.puts recipe_env_node_j}
@@ -145,12 +145,14 @@ module Itamae
               node = node_property[:environments][:hostname]
               ssh_user = node_property[:environments][:ssh_user]
               ssh_password = node_property[:environments][:ssh_password]
+              sudo_password = node_property[:environments][:sudo_password]
               ssh_port = node_property[:environments][:ssh_port]
               ssh_key = node_property[:environments][:ssh_key]
 
               ENV['TARGET_HOST'] = node
               ENV['NODE_FILE'] = node_file
               ENV['SSH_PASSWORD'] = ssh_password
+              ENV['SUDO_PASSWORD'] = sudo_password
 
               command = "bundle exec itamae ssh"
               command << " -h #{node}"
@@ -178,7 +180,7 @@ module Itamae
               command << command_recipe.join
 
               color.echos(:red ,%!Run Itamae to \"#{bname}\"!)
-              color.echos(:blue, %!Set Roles to \"#{get_roles(node_file).join(", ")}\"!)
+              color.echos(:blue, %!Role List to \"#{get_roles(node_file).join(", ")}\"!)
               run_list_noti = []
               command_recipe.each {|c_recipe| run_list_noti << c_recipe.split("/") [2]}
               color.echos(:green, %!Run List to \"#{run_list_noti.uniq.join(", ")}\"!)

data/lib/itamae/mitsurin/itamae_with_git_task.rb

@@ -76,7 +76,7 @@ module Itamae
         namespace :itamae do
           branches = Specinfra.backend.run_command('git branch')
             branch = branches.stdout.split("\n").select{|a| /\*/ === a }
-            branch = branch.pop.gsub(/\* (.+)/, '\1')
+            branch = branch.join.gsub(/\* (.+)/, '\1')
             if branch == 'staging'
               branch = 'staging/**'
             elsif branch == 'master'
@@ -84,7 +84,6 @@ module Itamae
             else
               branch = 'other/**'
             end
-          end
 
           Dir.glob("nodes/#{branch}/*.json").each do |node_file|
 
@@ -162,12 +161,14 @@ module Itamae
               node = node_property[:environments][:hostname]
               ssh_user = node_property[:environments][:ssh_user]
               ssh_password = node_property[:environments][:ssh_password]
+              sudo_password = node_property[:environments][:sudo_password]
               ssh_port = node_property[:environments][:ssh_port]
               ssh_key = node_property[:environments][:ssh_key]
 
               ENV['TARGET_HOST'] = node
               ENV['NODE_FILE'] = node_file
               ENV['SSH_PASSWORD'] = ssh_password
+              ENV['SUDO_PASSWORD'] = sudo_password
 
               command = "bundle exec itamae ssh"
               command << " -h #{node}"
@@ -195,7 +196,7 @@ module Itamae
               command << command_recipe.join
 
               color.echos(:red ,%!Run Itamae to \"#{bname}\"!)
-              color.echos(:blue, %!Set Roles to \"#{get_roles(node_file).join(", ")}\"!)
+              color.echos(:blue, %!Role List to \"#{get_roles(node_file).join(", ")}\"!)
               run_list_noti = []
               command_recipe.each {|c_recipe| run_list_noti << c_recipe.split("/") [2]}
               color.echos(:green, %!Run List to \"#{run_list_noti.uniq.join(", ")}\"!)

data/lib/itamae/mitsurin/serverspec_task.rb

@@ -44,6 +44,8 @@ module Itamae
           recipes
         end
 
+        color = SimpleColor.new
+
         namespace :spec do
           all = []
           Dir.glob("tmp-nodes/**/*.json").each do |node_file|
@@ -74,6 +76,7 @@ module Itamae
             node_name = node_attr[:environments][:hostname]
             ssh_user = node_attr[:environments][:ssh_user]
             ssh_password = node_attr[:environments][:ssh_password]
+            sudo_password = node_attr[:environments][:sudo_password]
             ssh_port = node_attr[:environments][:ssh_port]
             ssh_key = node_attr[:environments][:ssh_key]
 
@@ -84,7 +87,9 @@ module Itamae
               ENV['TARGET_HOST'] = node_name
               ENV['NODE_FILE'] = node_file
               ENV['SSH_PASSWORD'] = ssh_password
+              ENV['SUDO_PASSWORD'] = sudo_password
               ENV['SSH_KEY'] = "keys/#{ssh_key}"
+              ENV['SSH_PORT'] = ssh_port
 
               specs = "bundle exec rspec"
 
@@ -105,7 +110,6 @@ module Itamae
               spec_pattern.each {|c_spec| run_list_noti << c_spec.split("/") [2]}
               color.echos(:red ,%!Run Serverspec to \"#{node_name}\"!)
               color.echos(:green, %!Run List to \"#{run_list_noti.uniq.join(", ")}\"!)
-              puts color.echos(:white, %!#{specs}!)
               st = system specs
               exit 1 unless st
             end

data/lib/itamae/mitsurin/version.txt

@@ -1 +1 @@
-0.3
+0.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Akihiro Kamiyama