itamae-mitsurin 0.32 → 0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa40997c28e38b4b9ce062e83505eb5f4f33510
-  data.tar.gz: 232581689530c1e3e32893e4b9c41d37c0285ef5
+  metadata.gz: 9e3f1370d112d2e17244121f7844b94d13d35efd
+  data.tar.gz: 93da50239d20cb233da87db9974d74b1d50083a6
 SHA512:
-  metadata.gz: f54264aa9d3aa84983404dfb2cc27b4bfb1c40f40d35c480ce764624c5cf05045ee63241b0b16beb2ae0c8099d2e5d512913361463d1abcf77d873648d6651d3
-  data.tar.gz: cd6a2443f8c187bda4f7ac51ce18ade3838d71930ed8cf126d3f42982ca747e4598429bf5ec9dc8ee1f4e04307b8d84488cc110c85985a77d7fb88207fc632f1
+  metadata.gz: 5e26ec058020c8bab2607f7c71ea9ecfe9da021ae5062c836653d9541742c386cbca28bc9f2289e4a474a3e583a82678fc6ea6f7e80f541051a51141c41c7a91
+  data.tar.gz: 21aa878a2c844a67d7e6475c4c2746f253db1f04c331faf28ed9d78909dd76ec35c27cd4ad51afacf20d1e48faec9b0794b36682110438018663c026515b55fd

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

@@ -1,9 +1,14 @@
 ### The main itamae task
 require 'itamae-mitsurin/mitsurin/itamae_task'
 
-### Change the directory to be read by the current git branch
+### Change the nodes to be load by a branch of the current git
+### In the case of now 'master' the task nodes in the 'nodes/master/'
 # require 'itamae-mitsurin/mitsurin/itamae_with_git_task'
 
+### Change the nodes to be read by a target mode
+### `rake -T <target>` to load a 'nodes/<target>'
+# require 'itamae-mitsurin/mitsurin/itamae_with_target_task'
+
 ### Itamae task for AWS ec2instnce
 require 'itamae-mitsurin/mitsurin/local_task'
 

data/lib/itamae-mitsurin/mitsurin/{itamae_with_git_task_old.rb → itamae_with_target_task.rb}

@@ -1,35 +1,36 @@
-require 'specinfra'
-require 'json'
-require 'highline'
-require 'specinfra/helper/set'
 require 'itamae-mitsurin/mitsurin/task_base'
-include Specinfra::Helper::Set
 include Rake::DSL if defined? Rake::DSL
 
-module Itamae
+module ItamaeMitsurin
   module Mitsurin
     class ItamaeTask
 
-      set :backend, :exec
-
       namespace :itamae do
-        branches = Specinfra.backend.run_command('git branch')
-        branch = branches.stdout.split("\n").select {|a| /\*/ === a }
-        branch = branch.join.gsub(/\* (.+)/, '\1')
-        if branch == 'staging'
-          branch = 'staging/**'
-        elsif branch == 'master'
-          branch = 'production/**'
-        else
-          all = Dir.entries("nodes/")
-          all.delete_if {|d| /(^\.|staging|production|.json)/ === d }
-          branch = "{#{all.join(",")}}/**"
+        if (ARGV[0] == '-T' || ARGV[0] == '--tasks') && ARGV[1] != nil
+          if File.exists?("nodes/#{ARGV[1]}")
+          project_h = {:project => ARGV[1]}
+          File.open "Project.json", 'w' do |f|
+            f.flock File::LOCK_EX
+            f.puts project_h.to_json
+            f.flock File::LOCK_UN
+          end
+          puts TaskBase.hl.color "Changed target mode '#{ARGV[1]}'", :green
+          else
+            raise "Change mode error '#{ARGV[1]}' is not exists"
+          end
         end
+        ret = JSON.parse(File.read("Project.json"))
+        target = ret["project"] << '/**'
 
-        Dir.glob("nodes/#{branch}/*.json").each do |node_file|
-
+        Dir.glob("nodes/#{target}/*.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 "Node error, nodefile:#{node_file}, reason:#{e.message}"
+          end
 
           desc "Itamae to #{bname}"
           task node_h[:environments][:hostname].split(".")[0] do
@@ -43,7 +44,7 @@ module Itamae
               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 "Node or role error, nodefile:#{node_file}, reason:#{e.message}"
             else
               recipes.flatten!
             end
@@ -51,18 +52,19 @@ module Itamae
             # 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 "Node or environment error, nodefile:#{node_file}, reason:#{e.message}"
             end
 
-            # get recipe attr
+            # 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")
@@ -71,31 +73,31 @@ 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 = TaskBase.jq node_env_h
               TaskBase.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 = TaskBase.jq recipe_env_node_h
               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]
@@ -119,24 +121,32 @@ module Itamae
             command << " --ask-password" unless ssh_password.nil?
             command << " --dry-run" if ENV['dry-run'] == "true"
             command << " -l debug" if ENV['debug'] == "true"
+            command << " -c logs/config/itamae_with_git_task.config"
 
-            # recipe load to_command
+              # 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}"
+              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb"
+              unless File.exists?("#{Dir.glob(target_recipe).join}")
+                ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
+                raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
               end
+              command_recipe << " #{Dir.glob(target_recipe).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]}
+            command_recipe.each { |c_recipe|
+              unless c_recipe.split("/")[4].split(".")[0] == 'default'
+                run_list_noti << c_recipe.split("/")[2] + "::#{c_recipe.split("/")[4].split(".")[0]}"
+              else
+                run_list_noti << c_recipe.split("/")[2]
+              end
+            }
+
             puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
             puts TaskBase.hl.color(%!#{command}!, :white)
             st = system command

data/lib/itamae-mitsurin/version.txt

@@ -1 +1 @@
-0.32
+0.33

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.32'
+  version: '0.33'
 platform: ruby
 authors:
 - Akihiro Kamiyama
@@ -331,7 +331,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/itamae_with_git_task_old.rb
+- lib/itamae-mitsurin/mitsurin/itamae_with_target_task.rb
 - lib/itamae-mitsurin/mitsurin/local_task.rb
 - lib/itamae-mitsurin/mitsurin/serverspec_task.rb
 - lib/itamae-mitsurin/mitsurin/task_base.rb