itamae-mitsurin 0.12 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68809a61d7faf30d53cf1acf769b64d2b9d4bab4
-  data.tar.gz: 0a0664ce51fe7814e5c8930e124eb119eff09c67
+  metadata.gz: 0569c16f25204c1c623fcc4067ca68c04b8afc33
+  data.tar.gz: b83eda09fa7bd239be9014f368a4793e4fd48b93
 SHA512:
-  metadata.gz: 9e1d33a2a2557769d0e32c7394c8a4b9f0aa190a891dd4913672882cc2b614dbf44e95ae3d0cadcd40ea1730e15ec504197560e7335b65802527de92dc6f2b47
-  data.tar.gz: 38bdd3bde535d2d3a2570bef2262c438f8cee0d9c79d112ac9b3fc9b3d431dcbb8bc240cabf5b75c1f057d6352e986a900455da98c62d36e733f7c59b8235727
+  metadata.gz: ef9675110a3974320efc7f319b88799fb762d261a49d533bf8b648cdcd944a74205204b4bf5be01d2ee1717d7dfa675f7615715d08e37af533d1b0c1bedb3b81
+  data.tar.gz: 5e6cbc175cfae25369362d30c0b0045bc7a167748506276d427e070527bdde605832f9f029a0b3f85014c3269bb71b5edd2dc5cd21ff886cdf85c4a05036fb20

data/README.md

@@ -13,14 +13,17 @@ Customized version of Itamae and plugin
 
 ```
 $ gem install itamae-mitsurin
-$ mkdir [project_dir]
-$ cd [project_dir]
 $ manaita init
 ```
 
+## If you want to use the AWS Resources
+```
+$ aws configure
+```
+
 - Tips for AmazonLinux
 ```
-yum install ruby-devel ruby20-devel gcc-c++ rubygem20-io-console.x86_64
+yum install ruby-devel ruby20-devel gcc-c++ rubygem20-io-console
 ```
 
 ## Usage AWS Resource

data/itamae-mitsurin.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "io-console"
   spec.add_runtime_dependency "bundler"
+  spec.add_runtime_dependency "tempdir"
 
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/itamae-mitsurin/mitsurin/creators/templates/project/Rakefile

@@ -1,3 +1,4 @@
 require 'itamae-mitsurin/mitsurin/itamae_task'
 #require 'itamae-mitsurin/mitsurin/itamae_with_git_task'
+require 'itamae-mitsurin/mitsurin/local_task'
 require 'itamae-mitsurin/mitsurin/serverspec_task'

data/lib/itamae-mitsurin/mitsurin/creators/templates/project/environments/nothing.json

@@ -0,0 +1,5 @@
+{
+  "environments": {
+
+  }
+}

data/lib/itamae-mitsurin/mitsurin/itamae_task.rb

@@ -1,5 +1,3 @@
-require 'json'
-require 'highline'
 require 'itamae-mitsurin/mitsurin/task_base'
 include Rake::DSL if defined? Rake::DSL
 
@@ -11,7 +9,12 @@ module ItamaeMitsurin
         Dir.glob("nodes/**/*.json").each do |node_file|
 
           bname = File.basename(node_file, '.json')
-          node_h = JSON.parse(File.read(node_file), symbolize_names: true)
+          begin
+            node_h = JSON.parse(File.read(node_file), symbolize_names: true)
+          rescue JSON::ParserError => e
+            puts e.class.to_s + ", " + e.backtrace[0].to_s
+            puts "nodefile error, nodefile:#{node_file}, reason:#{e.message}"
+          end
 
           desc "Itamae to #{bname}"
           task node_h[:environments][:hostname].split(".")[0] do
@@ -25,7 +28,7 @@ module ItamaeMitsurin
               end
             rescue Exception => e
               puts e.class.to_s + ", " + e.backtrace[0].to_s
-              puts "nodefile or role error, nodefile:#{node_file} reason:#{e.message}"
+              puts "nodefile or role error, nodefile:#{node_file}, reason:#{e.message}"
             else
               recipes.flatten!
             end
@@ -33,18 +36,19 @@ module ItamaeMitsurin
             # get env attr
             begin
               env_set = node_h[:environments][:set]
+              raise "No environments set error" if env_set.nil?
               env_h = JSON.parse(File.read("environments/#{env_set}.json"), symbolize_names: true)
             rescue Exception => e
               puts e.class.to_s + ", " + e.backtrace[0].to_s
-              puts "nodefile or environments error, nodefile:#{node_file} reason:#{e.message}"
+              puts "nodefile or environments error, nodefile:#{node_file}, reason:#{e.message}"
             end
 
             # get recipes attr
             recipe_attr_file = []
             recipes.each do |recipe_h|
-              if recipe_h["#{recipe_h.keys.join}"].nil?
+              if recipe_h["#{recipe_h.keys.join}"] == "default"
                 recipe_attr_file.insert 0,
-                    Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/attributes/default.json")
+                    Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/attributes/#{recipe_h["#{recipe_h.keys.join}"]}.json")
               else
                 recipe_attr_file <<
                     Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/attributes/#{recipe_h["#{recipe_h.keys.join}"]}.json")
@@ -77,7 +81,7 @@ module ItamaeMitsurin
               TaskBase.write_json(bname) {|file| file.puts recipe_env_node_j}
             end
 
-            recipes << {'_base' => nil}
+            recipes << {'_base' => 'default'}
             node_property = JSON.parse(File.read("tmp-nodes/#{bname}.json"), symbolize_names: true)
             node = node_property[:environments][:hostname]
             ssh_user = node_property[:environments][:ssh_user]
@@ -105,13 +109,8 @@ module ItamaeMitsurin
               # recipe load to_command
             command_recipe = []
             recipes.each do |recipe_h|
-              if recipe_h["#{recipe_h.keys.join}"].nil?
-                command_recipe <<
-                    " #{Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/recipes/default.rb").join}"
-              else
-                command_recipe <<
-                    " #{Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb").join}"
-              end
+              command_recipe <<
+                  " #{Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb").join("\s")}"
             end
 
             command_recipe.sort_by! {|item| File.dirname(item)}

data/lib/itamae-mitsurin/mitsurin/local_task.rb

@@ -0,0 +1,137 @@
+require 'itamae-mitsurin/mitsurin/task_base'
+include Rake::DSL if defined? Rake::DSL
+
+# For AWS Resources
+
+module ItamaeMitsurin
+  module Mitsurin
+    class LocalTask
+      namespace :local do
+        Dir.glob("nodes/**/*.json").each do |node_file|
+          bname = File.basename(node_file, '.json')
+
+          begin
+            node_h = JSON.parse(File.read(node_file), symbolize_names: true)
+          rescue JSON::ParserError => e
+            puts e.class.to_s + ", " + e.backtrace[0].to_s
+            puts "nodefile error, nodefile:#{node_file}, reason:#{e.message}"
+          else
+            all << node_h[:environments][:hostname].split(".")[0]
+            task :all => all
+          end
+
+          desc "Local to #{bname}"
+          task node_h[:environments][:hostname].split(".")[0] do
+            begin
+              recipes = []
+              TaskBase.get_roles(node_file).each do |role|
+                recipes << TaskBase.get_recipes(role)
+              end
+              TaskBase.get_node_recipes(node_file).each do |recipe|
+                recipes << recipe
+              end
+            rescue Exception => e
+              puts e.class.to_s + ", " + e.backtrace[0].to_s
+              puts "nodefile or role error, nodefile:#{node_file}, reason:#{e.message}"
+            else
+              recipes.flatten!
+            end
+
+            # get env attr
+            begin
+              env_set = node_h[:environments][:set]
+              raise "No environments set error" if env_set.nil?
+              env_h = JSON.parse(File.read("environments/#{env_set}.json"), symbolize_names: true)
+            rescue Exception => e
+              puts e.class.to_s + ", " + e.backtrace[0].to_s
+              puts "nodefile or environments error, nodefile:#{node_file}, reason:#{e.message}"
+            end
+
+            # get recipes attr
+            recipe_attr_file = []
+            recipes.each do |recipe_h|
+              if recipe_h["#{recipe_h.keys.join}"] == "default"
+                recipe_attr_file.insert 0,
+                    Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/attributes/#{recipe_h["#{recipe_h.keys.join}"]}.json")
+              else
+                recipe_attr_file <<
+                    Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/attributes/#{recipe_h["#{recipe_h.keys.join}"]}.json")
+              end
+            end
+
+            recipe_attr_file.flatten!
+
+            # 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_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?
+              # env attr other=node
+              node_env_h = env_h.deep_merge(node_h)
+              node_env_j = TaskBase.jq node_env_h
+              path = TaskBase.write_tmp_json(bname) {|file| file.puts node_env_j}
+            else
+              # recipe_env attr other=node
+              recipe_env_node_h = recipe_env_h.deep_merge(node_h)
+              recipe_env_node_j = TaskBase.jq recipe_env_node_h
+              path = TaskBase.write_tmp_json(bname) {|file| file.puts recipe_env_node_j}
+            end
+
+            recipes << {'_base' => 'default'}
+            node_property = JSON.parse(File.read("tmp-nodes/#{bname}.json"), symbolize_names: true)
+            node = node_property[:environments][:hostname]
+            sudo_password = node_property[:environments][:sudo_password]
+
+            ENV['TARGET_HOST'] = node
+            ENV['NODE_FILE'] = node_file
+            ENV['SUDO_PASSWORD'] = sudo_password
+
+            command = "bundle exec itamae local"
+            command << " -h #{node}"
+            command << " -j #{path}/#{bname}.json"
+            command << " --shell=bash"
+            command << " --ask-password" unless ssh_password.nil?
+            command << " --dry-run" if ENV['dry-run'] == "true"
+            command << " -l debug" if ENV['debug'] == "true"
+
+              # recipe load to_command
+            command_recipe = []
+            recipes.each do |recipe_h|
+              command_recipe <<
+                  " #{Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb").join("\s")}"
+            end
+
+            command_recipe.sort_by! {|item| File.dirname(item)}
+            command << command_recipe.join
+
+            puts TaskBase.hl.color(%!Run Itamae to \"#{bname}\"!, :red)
+            run_list_noti = []
+            command_recipe.each {|c_recipe| run_list_noti << c_recipe.split("/") [2]}
+            puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
+            puts TaskBase.hl.color(%!#{command}!, :white)
+            begin
+              st = system command
+            rescue Exception => e
+              puts "command error, nodefile:#{node_file}, reason:#{e.message}"
+              puts "#{e.backtrace}"
+            ensure
+              FileUtils.remove_entry_secure path
+              exit 1 unless st
+            end
+          end
+        end
+        desc "local init all"
+        task :local => 'local:all'
+      end
+
+    end
+  end
+end

data/lib/itamae-mitsurin/mitsurin/serverspec_task.rb

@@ -1,5 +1,3 @@
-require 'json'
-require 'highline'
 require 'itamae-mitsurin/mitsurin/task_base'
 include Rake::DSL if defined? Rake::DSL
 
@@ -14,37 +12,43 @@ module Itamae
         Dir.glob("tmp-nodes/**/*.json").each do |node_file|
 
           file_name = File.basename(node_file, '.json')
-          node_attr = JSON.parse(File.read(node_file), symbolize_names: true)
+          begin
+            node_attr = JSON.parse(File.read(node_file), symbolize_names: true)
+          rescue JSON::ParserError => e
+            puts e.class.to_s + ", " + e.backtrace[0].to_s
+            puts "nodefile error, nodefile:#{node_file}, reason:#{e.message}"
+          end
 
           desc "Spec to #{file_name}"
           task node_attr[:environments][:hostname].split(".")[0] do
 
-          begin
-            recipes = []
-            TaskBase.get_roles(node_file).each do |role|
-              recipes << TaskBase.get_recipes(role)
-            end
-            TaskBase.get_node_recipes(node_file).each do |recipe|
-              recipes << recipe
+            begin
+              recipes = []
+              TaskBase.get_roles(node_file).each do |role|
+                recipes << TaskBase.get_recipes(role)
+              end
+              TaskBase.get_node_recipes(node_file).each do |recipe|
+                recipes << recipe
+              end
+            rescue Exception => e
+              puts e.class.to_s + ", " + e.backtrace[0].to_s
+              puts "nodefile or role error, nodefile:#{node_file} reason:#{e.message}"
+              exit 1
+            else
+              recipes << {'_base' => 'default'}
+              recipes.flatten!
             end
-          rescue Exception => e
-            puts e.class.to_s + ", " + e.backtrace[0].to_s
-            puts "nodefile or role error, nodefile:#{node_file} reason:#{e.message}"
-            exit 1
-          else
-            recipes << {'_base' => nil}
-            recipes.flatten!
-          end
 
-          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]
+            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]
 
-          node_short = node_name.split(".")[0]
+            node_short = node_name.split(".")[0]
             all << node_short
+            task :all => all
 
             desc "Run spec to #{file_name}"
             ENV['TARGET_HOST'] = node_name
@@ -60,13 +64,8 @@ module Itamae
             # recipe load to_spec
             spec_pattern = []
             recipes.each do |spec_h|
-              if spec_h["#{spec_h.keys.join}"].nil?
-                spec_pattern <<
-                    " #{Dir.glob("site-cookbooks/**/#{spec_h.keys.join}/spec/default_spec.rb").join}"
-              else
-                spec_pattern <<
-                    " #{Dir.glob("site-cookbooks/**/#{spec_h.keys.join}/spec/#{spec_h["#{spec_h.keys.join}"]}_spec.rb").join}"
-              end
+              spec_pattern <<
+                " #{Dir.glob("site-cookbooks/**/#{spec_h.keys.join}/spec/#{spec_h["#{spec_h.keys.join}"]}_spec.rb").join("\s")}"
             end
 
             spec_pattern.sort_by! {|item| File.dirname(item)}
@@ -78,8 +77,8 @@ module Itamae
             st = system specs
             exit 1 unless st
           end
-        task :all => all
-        task :default => :all
+        desc "Serverspec to all nodes"
+        task :all => 'spec:all'
         end
       end
 

data/lib/itamae-mitsurin/mitsurin/task_base.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'highline'
+require "tmpdir"
 
 module ItamaeMitsurin
   module Mitsurin
@@ -30,7 +33,7 @@ module ItamaeMitsurin
             if /recipe\[(.+)::(.+)\]/ === recipe
               recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
             else
-              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil}
+              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => 'default'}
             end
           end
           recipes
@@ -42,7 +45,7 @@ module ItamaeMitsurin
             if /recipe\[(.+)::(.+)\]/ === recipe
               recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
             else
-              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil} unless /role\[(.+)\]/ === recipe
+              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => 'default'} unless /role\[(.+)\]/ === recipe
             end
           end
           recipes
@@ -62,6 +65,16 @@ module ItamaeMitsurin
           end
         end
 
+        def write_tmp_json(filename)
+          path = Dir.mktmpdir("mitsurin-")
+          open("#{path}/#{filename}.json", "w") do |f|
+            f.flock File::LOCK_EX
+            yield f
+            f.flock File::LOCK_UN
+          end
+          path
+        end
+
         def hl
           HighLine.new
         end

data/lib/itamae-mitsurin/version.txt

@@ -1 +1 @@
-0.12
+0.13

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - Akihiro Kamiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tempdir
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +308,7 @@ files:
 - lib/itamae-mitsurin/mitsurin/creators/templates/project/Gemfile
 - lib/itamae-mitsurin/mitsurin/creators/templates/project/Rakefile
 - lib/itamae-mitsurin/mitsurin/creators/templates/project/environments/.keep
+- lib/itamae-mitsurin/mitsurin/creators/templates/project/environments/nothing.json
 - lib/itamae-mitsurin/mitsurin/creators/templates/project/environments/sample.json
 - lib/itamae-mitsurin/mitsurin/creators/templates/project/keys/.keep
 - lib/itamae-mitsurin/mitsurin/creators/templates/project/nodes/.keep
@@ -315,6 +330,7 @@ files:
 - lib/itamae-mitsurin/mitsurin/creators/templates/site-cookbooks/spec/default_spec.rb
 - lib/itamae-mitsurin/mitsurin/itamae_task.rb
 - lib/itamae-mitsurin/mitsurin/itamae_with_git_task.rb
+- lib/itamae-mitsurin/mitsurin/local_task.rb
 - lib/itamae-mitsurin/mitsurin/serverspec_task.rb
 - lib/itamae-mitsurin/mitsurin/task_base.rb
 - lib/itamae-mitsurin/node.rb