itamae-spec 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c331c48127fb1a98218a1a3c3558ced75f5be9c8ca8498a5a5cc90d1f317314c
-  data.tar.gz: 61b144fafd16ca07d70edbfd545021433a47db68872ddf61d44ad7a42c93b752
+SHA1:
+  metadata.gz: af9d5a2459650b8225a75cb2a4d458d57cf92e44
+  data.tar.gz: fde860c26863479fc733668a0e2ad807cc517626
 SHA512:
-  metadata.gz: a66032f85bcee1eb44d9fad26a0a1ccffab6d76eda4f6cb8965f1c1f22fd121519fe6347b4e3b1cfb72c04087227b4f905714865019b384841c1b8527abc4627
-  data.tar.gz: 51d791fe0021ca63c798441d214d018d0f74301b92cb91ccece9ce1b05edf7f00902777fa6242bf8820f0f9802332e9d662c5b90be8a1f22e58612706b0d8de2
+  metadata.gz: fbbf48963e518d50a3fc5404d7a8bc8150701c289d0d633991a88aa3c2e0329ec843f4eae671beecdef7ffaa998a4bd627a5ed3479fcd8f1423102c23356b086
+  data.tar.gz: 01d7ac3b79977f89b726a93246f995e7b376d8386fab91f6ef642c8dfbef00fbdcbe5d4103319291605d5480cb596c10f1c3e29b1dfbce8a89e5216da31c781b

data/README.md

@@ -21,6 +21,15 @@ $ itamae-spec init your-project-name
 $ aws configure
 ```
 
+## Tips for git user
+- Add this content to your `.gitignore`
+```
+tmp-nodes/
+logs/
+Project.json
+!.keep
+```
+
 ## Getting Started
 - [Getting Started](https://github.com/kammy1231/itamae-spec/wiki/Getting-Started)
 

data/itamae-spec.gemspec

@@ -20,7 +20,10 @@ It can be provisioning using itamae's some AWS resources.}
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.0")
 
-  spec.add_runtime_dependency "aws-sdk", "~> 2"
+  spec.add_runtime_dependency "aws-sdk-core", "~> 3"
+  spec.add_runtime_dependency "aws-sdk-ec2"
+  spec.add_runtime_dependency "aws-sdk-s3"
+  spec.add_runtime_dependency "aws-sdk-route53"
   spec.add_runtime_dependency "serverspec", "~> 2.1"
   spec.add_runtime_dependency "itamae", "1.9.11"
   spec.add_runtime_dependency "rake"

data/lib/itamae-spec/resource/route53_record.rb

@@ -1,4 +1,5 @@
 require 'multi_json'
+require 'aws-sdk-route53'
 
 module Itamae
   module Resource

data/lib/itamae-spec/resource/s3_file.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-s3'
 
 module Itamae
   module Resource

data/lib/itamae-spec/task/base.rb

@@ -5,6 +5,7 @@ module ItamaeSpec
   module Task
     module Base
       RoleLoadError = Class.new(StandardError)
+      EnvironmentsLoadError = Class.new(StandardError)
 
       class ::Hash
         def deep_merge(other_hash, &block)
@@ -39,6 +40,31 @@ module ItamaeSpec
       end
 
       class << self
+        def get_roles(node_file)
+          roles = []
+          JSON.parse(File.read(node_file))['run_list'].each do |recipe|
+            if /role\[(.+)\]/.match?(recipe)
+              roles << recipe.gsub(/role\[(.+)\]/, '\1')
+            end
+          end
+        rescue JSON::ParserError
+          raise RoleLoadError, "JSON Parser Faild. - #{node_file}"
+        rescue Errno::ENOENT
+          raise RoleLoadError, "No such node file or directory - #{node_fie}"
+        else
+          roles
+        end
+
+        def get_environments(node_file)
+          environments = JSON.parse(File.read(node_file))['environments']['set']
+        rescue JSON::ParserError
+          raise EnvironmentsLoadError, "JSON Parser Faild. - #{node_file}"
+        rescue Errno::ENOENT
+          raise EnvironmentsLoadError, "No such node file or directory - #{node_fie}"
+        else
+          environments
+        end
+
         def get_role_recipes(role)
           recipes = []
           JSON.parse(File.read("roles/#{role}.json"))['run_list'].each do |recipe|

data/lib/itamae-spec/task/base_task.rb

@@ -3,9 +3,10 @@ require 'itamae-spec/task/base'
 module ItamaeSpec
   module Task
     class BaseTask
+
+      include Base
       extend Rake::DSL if defined? Rake::DSL
 
-      EnvironmentsSetError = Class.new(StandardError)
       LoadRecipeError = Class.new(StandardError)
       LoadAttributeError = Class.new(StandardError)
 
@@ -21,12 +22,20 @@ module ItamaeSpec
         run_list.flatten
       end
 
-      def load_environments(hash)
-        set = hash[:environments][:set]
-        raise EnvironmentsSetError, 'Environments Set is not specified in nodefile' if set.nil?
-        JSON.parse(File.read("environments/#{set}.json"), symbolize_names: true)
+      def load_environments(environments)
+        JSON.parse(File.read("environments/#{environments}.json"), symbolize_names: true)
+      rescue JSON::ParserError
+        raise LoadAttributeError, "JSON Parser Failed. - environments/#{environments}.json"
+      end
+
+      def load_role_attributes(role)
+        attributes = JSON.parse(File.read("roles/#{role}.json"), symbolize_names: true)
+        attributes.delete(:run_list)
+        key = attributes[role.to_sym]
+        raise LoadAttributeError, 'Role attribute is not specified in :role_name' if key.nil?
+        attributes
       rescue JSON::ParserError
-        raise LoadAttributeError, "JSON Parser Failed. - environments/#{set}.json"
+        raise LoadAttributeError, "JSON Parser Failed. - roles/#{role}.json"
       end
 
       def load_recipe_attributes(run_list)
@@ -58,6 +67,21 @@ module ItamaeSpec
         merged
       end
 
+      def apply_attributes(node_file)
+        node_attributes = load_node_attributes(node_file)
+        environments = Base.get_environments(node_file)
+        environments_attributes = load_environments(environments)
+        roles = Base.get_roles(node_file)
+        role_attributes_list = roles.map {|role | load_role_attributes(role) }
+        run_list = load_run_list(node_file)
+        recipe_attributes_list = load_recipe_attributes(run_list)
+
+        merged_recipe = merge_attributes(recipe_attributes_list)
+        merged_environments = merge_attributes(merged_recipe, environments_attributes)
+        merged_role = merge_attributes(role_attributes_list)
+        attributes = merge_attributes(merged_role, node_attributes)
+      end
+
       def create_tmp_nodes(filename, hash)
         json = hash.to_pretty_json
         Base.write_tmp_nodes(filename) {|f| f.puts json }
@@ -74,7 +98,11 @@ module ItamaeSpec
                    end
 
         command << " -u #{hash[:environments][:ssh_user]}"
-        command << " -p #{hash[:environments][:ssh_port]}"
+        command << if hash[:environments][:ssh_port]
+                     " -p #{hash[:environments][:ssh_port]}"
+                   else
+                     ' -p 22'
+                   end
         command << " -i keys/#{hash[:environments][:ssh_key]}" if hash[:environments][:ssh_key]
         command << " -j tmp-nodes/#{node_name}.json"
 

data/lib/itamae-spec/task/itamae_task.rb

@@ -21,7 +21,7 @@ module ItamaeSpec
       end
 
       Itamae.logger.formatter.colored = true
-      task = ItamaeTask.new
+      task = BaseTask.new
 
       namespace :itamae do
         all = []
@@ -77,12 +77,7 @@ module ItamaeSpec
 
             begin
               run_list = task.load_run_list(node_file)
-              environments = task.load_environments(node)
-              recipe_attributes_list = task.load_recipe_attributes(run_list)
-
-              merged_recipe = task.merge_attributes(recipe_attributes_list)
-              merged_environments = task.merge_attributes(merged_recipe, environments)
-              attributes = task.merge_attributes(merged_environments, node)
+              attributes = task.apply_attributes(node_file)
               task.create_tmp_nodes(node_name, attributes)
 
               command = task.create_itamae_command(node_name, attributes)
@@ -100,6 +95,7 @@ module ItamaeSpec
                 exit 1
               end
             rescue => e
+              Itamae.logger.error e.backtrace[0]
               Itamae.logger.error e.inspect
               Itamae.logger.info "From node file: #{node_file}"
               exit 2

data/lib/itamae-spec/task/local_itamae_task.rb

@@ -48,17 +48,11 @@ module ItamaeSpec
 
             begin
               run_list = task.load_run_list(node_file)
-              environments = task.load_environments(node)
-              recipe_attributes_list = task.load_recipe_attributes(run_list)
-
-              merged_recipe = task.merge_attributes(recipe_attributes_list)
-              merged_environments = task.merge_attributes(merged_recipe, environments)
-              attributes = task.merge_attributes(merged_environments, node)
+              attributes = task.apply_attributes(node_file)
               task.create_tmp_nodes(node_name, attributes)
 
               command = task.create_itamae_command(node_name, attributes)
               command_recipe = task.list_recipe_filepath(run_list)
-              command_recipe.sort_by! {|item| File.dirname(item) }
               command << command_recipe.join
 
               task.runner_display(attributes[:run_list], run_list, command)

data/lib/itamae-spec/task/local_serverspec_task.rb

@@ -90,12 +90,7 @@ module ItamaeSpec
 
             begin
               run_list = task.load_run_list(node_file)
-              environments = task.load_environments(node)
-              recipe_attributes_list = task.load_recipe_attributes(run_list)
-
-              merged_recipe = task.merge_attributes(recipe_attributes_list)
-              merged_environments = task.merge_attributes(merged_recipe, environments)
-              attributes = task.merge_attributes(merged_environments, node)
+              attributes = task.apply_attributes(node_file)
               task.create_tmp_nodes(node_name, attributes)
 
               command = task.create_spec_command(node_name, attributes)

data/lib/itamae-spec/task/serverspec_task.rb

@@ -76,12 +76,7 @@ module ItamaeSpec
 
             begin
               run_list = task.load_run_list(node_file)
-              environments = task.load_environments(node)
-              recipe_attributes_list = task.load_recipe_attributes(run_list)
-
-              merged_recipe = task.merge_attributes(recipe_attributes_list)
-              merged_environments = task.merge_attributes(merged_recipe, environments)
-              attributes = task.merge_attributes(merged_environments, node)
+              attributes = task.apply_attributes(node_file)
               task.create_tmp_nodes(node_name, attributes)
 
               command = task.create_spec_command(node_name, attributes)
@@ -99,6 +94,7 @@ module ItamaeSpec
                 exit 1
               end
             rescue => e
+              Itamae.logger.error e.backtrace[0]
               Itamae.logger.error e.inspect
               Itamae.logger.info "From node file: #{node_file}"
               exit 2

data/lib/itamae-spec/version.txt

@@ -1 +1 @@
-0.0.3
+0.0.4

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: itamae-spec
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kammy1231
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  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: aws-sdk-s3
+  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: aws-sdk-route53
+  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: serverspec
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Customized version of Itamae. Integration with Serverspec. It can be provisioning