itamae-mitsurin 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98af16ce485602c42d6c655f74254a1aea88e5bc
-  data.tar.gz: 418060a72f4afda2a17d5225e414e964b40fbc65
+  metadata.gz: 501496a4a667232eeeb4020024fb96d25dac514a
+  data.tar.gz: bfb410645c364d84f975ecc1e4aae10934920355
 SHA512:
-  metadata.gz: 117abcedca47117aeb52ec74c6498d3555989ecfc143d58926040d9d9ceee656136b8fc682799b53b79b88f6c344b46f538f99e4869a633bf669bb54f03e5f6e
-  data.tar.gz: 9559586324ed153975bc6810d563e5d7b93fe39bb608f0e728e1a70ff6c42d3ebe7ddfeb8f8bdda611eec6b8c9d035fdf53caf6dfba0652919ddc265dd919f5c
+  metadata.gz: af73678cf92dbc16f8353fe3635921ded6fa3ce1b622535983032a77e71b343285208a34636aa02080c59f8e3b30a812739835c72bbe505366d7db23889a3a78
+  data.tar.gz: 07f48d7d5393560061191d51dd7d079372c46a7a35344cf14671d81e904b57d76d01a0faec01a934affba32aaab9c9c70fd786f00486b1805984ada978837675

data/README.md

@@ -4,16 +4,17 @@ Customized version of Itamae and plugin
 
 ## Concept
 
-- More like Chef
-- Minimum attributes
+- Like more Chef
+- Little attributes
 - Support AWS Resource
-- Require Rake
 
 ## Installation
 
 ```
 $ gem install itamae-mitsurin
-$ itamae-mitsurin init [project_name]
+$ mkdir project_dir
+$ cd project_dir
+$ itamae-mitsurin init
 ```
 
 ## Usage AWS Resource
@@ -23,13 +24,13 @@ $ itamae-mitsurin init [project_name]
 
 Aws.config[:region] = 'ap-northeast-1'
 
-aws_ebs_volume 'db_ebs_volume' do
+aws_ebs_volume "ebs_name" do
   action [:create, :attach]
-  availability_zone 'ap-northeast-1b'
-  device '/dev/xvdf'
+  availability_zone "ap-northeast-1a"
+  device '/dev/xvdb'
   volume_type 'standard'
-  size 30
-  instance_id node['ec2']['instance-id']
+  size 10
+  instance_id 'i-xxxxxxx'
 end
 ```
 

data/itamae-mitsurin.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "itamae-mitsurin"
   spec.version       = Itamae::Mitsurin::VERSION
   spec.authors       = ["Akihiro Kamiyama"]
-  spec.email         = ["kamiyama@qualitia.co.jp"]
+  spec.email         = ["akihiro.vamps@gmail.com"]
   spec.summary       = %q{Customized version of Itamae and Itamae plugin}
   spec.homepage      = "https://github.com/kammy1231/itamae-mitsurin"
   spec.license       = "MIT"
@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "schash", "~> 0.1.0"
   spec.add_runtime_dependency "aws-sdk", "~> 2"
   spec.add_runtime_dependency "serverspec", [">= 2.30", "< 3.0.0"]
+  spec.add_runtime_dependency "rake"
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "docker-api", "~> 1.20"

data/lib/itamae/mitsurin.rb

@@ -1,9 +1,10 @@
 require 'itamae/mitsurin/version'
 require 'itamae/mitsurin/cli'
 require 'itamae/mitsurin/creators'
+require 'aws-sdk'
 #require 'itamae/mitsurin/itamae_task'
 #require 'itamae/mitsurin/serverspec_task'
-require 'aws-sdk'
+#require 'itamae/mitsurin/itamae_with_git_task'
 
 
 module Itamae

data/lib/itamae/mitsurin/cli.rb

@@ -7,7 +7,7 @@ module Itamae
     class CLI < Thor
       CREATE_TARGETS = %w[ cookbook ].freeze
 
-      class_option :with_git, type: :string, aliases: ['-g']
+#      class_option :with_git, type: :string, aliases: ['-g']
 
       desc "version", "Print version"
       def version

data/lib/itamae/mitsurin/creators/templates/project/nodes/sample01.json

@@ -3,6 +3,7 @@
     "recipe[_base]"
     ],
   "environments": {
+    "set": "sample",
     "hostname": "sample01.localhost"
   }
 }

data/lib/itamae/mitsurin/itamae_task.rb

@@ -8,7 +8,6 @@ module Itamae
     class ItamaeTask
 
       class << self
-
         class ::Hash
           def deep_merge(other)
             merger = lambda {|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2}
@@ -74,8 +73,8 @@ module Itamae
 
             bname = File.basename(node_file, '.json')
             node_h = JSON.parse(File.read(node_file), symbolize_names: true)
-            desc "Run to #{bname}"
 
+            desc "Itamae to #{bname}"
             task node_h[:environments][:hostname].split(".")[0] do
               begin
                 recipes = []
@@ -184,16 +183,14 @@ module Itamae
               command_recipe.each {|c_recipe| run_list_noti << c_recipe.split("/") [2]}
               color.echos(:green, %!Run List to \"#{run_list_noti.uniq.join(", ")}\"!)
               puts color.echos(:white, %!#{command}!)
-              stat = system command
-              if ! stat then
-                  exit(false)
-              end
+              st = system command
+              exit 1 unless st
             end
 
           end
         end
-
       end
+
     end
   end
 end

data/lib/itamae/mitsurin/itamae_with_git_task.rb

@@ -0,0 +1,213 @@
+require 'specinfra'
+require 'rake'
+require 'json'
+require 'simple_color'
+require 'specinfra/helper/set'
+include Specinfra::Helper::Set
+include Rake::DSL if defined? Rake::DSL
+
+module Itamae
+  module Mitsurin
+    class ItamaeTask
+
+      class << self
+        class ::Hash
+          def deep_merge(other)
+            merger = lambda {|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2}
+            self.merge(other, &merger)
+          end
+
+          def deep_merge!(other)
+            merger = lambda {|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2}
+            self.merge!(other, &merger)
+          end
+        end
+
+        def self.get_roles(node_file)
+          roles = []
+          JSON.parse(File.read(node_file))['run_list'].each do |role|
+            roles << role.gsub(/role\[(.+)\]/, '\1') if /role\[(.+)\]/ === role
+          end
+          roles
+        end
+
+        def self.get_recipes(role)
+          recipes = []
+          JSON.parse(File.read("roles/#{role}.json"))['run_list'].each do |recipe|
+            if /recipe\[(.+)::(.+)\]/ === recipe
+              recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
+            else
+              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil}
+            end
+          end
+          recipes
+        end
+
+        def self.get_node_recipes(node_file)
+          recipes = []
+          JSON.parse(File.read(node_file))['run_list'].each do |recipe|
+            if /recipe\[(.+)::(.+)\]/ === recipe
+              recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
+            else
+              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil} unless /role\[(.+)\]/ === recipe
+            end
+          end
+          recipes
+        end
+
+        def self.jq(*objs)
+          par = nil
+          objs.each {|obj| par = JSON::pretty_generate(obj, :allow_nan => true, :max_nesting => false)}
+          return par
+        end
+
+        def self.write_json(filename)
+          File.open "tmp-nodes/#{filename}.json", 'w' do |f|
+            f.flock File::LOCK_EX
+            yield f
+            f.flock File::LOCK_UN
+          end
+        end
+
+        color = SimpleColor.new
+
+        set :backend, :exec
+
+        namespace :itamae do
+          branches = Specinfra.backend.run_command('git branch')
+            branch = branches.stdout.split("\n").select{|a| /\*/ === a }
+            branch = branch.pop.gsub(/\* (.+)/, '\1')
+            if branch == 'staging'
+              branch = 'staging/**'
+            elsif branch == 'master'
+              branch = 'production/**'
+            else
+              branch = 'other/**'
+            end
+          end
+
+          Dir.glob("nodes/#{branch}/*.json").each do |node_file|
+
+            bname = File.basename(node_file, '.json')
+            node_h = JSON.parse(File.read(node_file), symbolize_names: true)
+
+            desc "Itamae to #{bname}"
+            task node_h[:environments][:hostname].split(".")[0] do
+              begin
+                recipes = []
+                get_roles(node_file).each do |role|
+                  recipes << get_recipes(role)
+                end
+                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.flatten!
+              end
+
+              # get env attr
+              begin
+                env_set = node_h[:environments][:set]
+                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}"
+                exit 1
+              end
+
+              # get recipe attr
+              recipe_attr_file = []
+              recipes.each do |recipe_h|
+                if recipe_h["#{recipe_h.keys.join}"].nil?
+                  recipe_attr_file.insert 0,
+                      Dir.glob("site-cookbooks/**/#{recipe_h.keys.join}/attributes/default.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!
+
+              # recipe 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
+              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
+                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_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}
+              end
+
+              recipes << {'_base' => nil}
+              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]
+              ssh_password = node_property[:environments][:ssh_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
+
+              command = "bundle exec itamae ssh"
+              command << " -h #{node}"
+              command << " -u #{ssh_user}"
+              command << " -p #{ssh_port}"
+              command << " -i keys/#{ssh_key}" unless ssh_key.nil?
+              command << " -j tmp-nodes/#{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|
+                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
+              end
+              command_recipe.sort_by! {|item| File.dirname(item)}
+              command << command_recipe.join
+
+              color.echos(:red ,%!Run Itamae to \"#{bname}\"!)
+              color.echos(:blue, %!Set Roles 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(", ")}\"!)
+              puts color.echos(:white, %!#{command}!)
+              st = system command
+              exit 1 unless st
+            end
+
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/itamae/mitsurin/serverspec_task.rb

@@ -1,6 +1,4 @@
-require 'serverspec'
 require 'rake'
-require 'rspec/core/rake_task'
 require 'json'
 require 'simple_color'
 include Rake::DSL if defined? Rake::DSL
@@ -52,7 +50,9 @@ module Itamae
 
             file_name = File.basename(node_file, '.json')
             node_attr = JSON.parse(File.read(node_file), symbolize_names: true)
-            desc "Run to #{file_name}"
+
+            desc "Spec to #{file_name}"
+            task node_attr[:environments][:hostname].split(".")[0] do
 
             begin
               recipes = []
@@ -81,24 +81,33 @@ module Itamae
             all << node_short
 
             desc "Run spec to #{file_name}"
-            RSpec::Core::RakeTask.new(node_short.to_sym) do |t|
               ENV['TARGET_HOST'] = node_name
               ENV['NODE_FILE'] = node_file
               ENV['SSH_PASSWORD'] = ssh_password
               ENV['SSH_KEY'] = "keys/#{ssh_key}"
 
-              specs = []
-              spec_recips = []
-              recipes.each {|hash|
-                specs << hash.keys.join
-                spec_recips << hash.values.join unless hash.values.join.empty?
-              }
+              specs = "bundle exec rspec"
 
-              t.pattern = "site-cookbooks/**/\{#{specs.join(',')}\}/spec/\{default,#{spec_recips.join(',')}\}_spec.rb"
-              t.fail_on_error = true
-              color = SimpleColor.new
-              color.echos(:red, "Run Serverspec to #{node_name}")
-              color.echos(:green, "Run List to #{specs.uniq.sort.join(", ")}")
+              # 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
+              end
+              spec_pattern.sort_by! {|item| File.dirname(item)}
+              specs << spec_pattern.join
+              run_list_noti = []
+              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
             task :all => all
             task :default => :all

data/lib/itamae/mitsurin/version.txt

@@ -1 +1 @@
-0.2
+0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Akihiro Kamiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -121,33 +121,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- kamiyama@qualitia.co.jp
+- akihiro.vamps@gmail.com
 executables:
 - itamae
 - itamae-mitsurin
@@ -272,6 +272,7 @@ files:
 - lib/itamae/mitsurin/creators/templates/project/Rakefile
 - lib/itamae/mitsurin/creators/templates/project/environments/.keep
 - lib/itamae/mitsurin/creators/templates/project/environments/sample.json
+- lib/itamae/mitsurin/creators/templates/project/keys/.keep
 - lib/itamae/mitsurin/creators/templates/project/nodes/.keep
 - lib/itamae/mitsurin/creators/templates/project/nodes/sample01.json
 - lib/itamae/mitsurin/creators/templates/project/roles/.keep
@@ -288,6 +289,7 @@ files:
 - lib/itamae/mitsurin/creators/templates/site-cookbooks/spec/.keep
 - lib/itamae/mitsurin/creators/templates/site-cookbooks/templates/.keep
 - lib/itamae/mitsurin/itamae_task.rb
+- lib/itamae/mitsurin/itamae_with_git_task.rb
 - lib/itamae/mitsurin/serverspec_task.rb
 - lib/itamae/mitsurin/version.rb
 - lib/itamae/mitsurin/version.txt