kondate 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f5e91857574eaabc22cc65ed6f34233fba10c5
-  data.tar.gz: 07397787296ef63c605c0ab20f766ab748ee58ef
+  metadata.gz: f9cce6830f15dbb3ee4856a3d0c789b23ad2a615
+  data.tar.gz: b891c2c1d573bd93672453ad93b1a94a01770370
 SHA512:
-  metadata.gz: fc9ad5b77a844d9927b38f1a01f27d54be156f7234754d8e131deac276ea29fd35e4fc544bc5354660e72c9f6f32f5983a8b9135ec949729aedd074266987984
-  data.tar.gz: 276617ad590a6040a19d2ab69a74e2abdbdeac9891117e48286a17ab4d79e455192a55897d4d0644024d4f008e92a195fa2b68ff0d239c94322190eb9344fe37
+  metadata.gz: c342ae98969f5f2ae78579d9bc52b1b8d89ed79d68f8ebbdb2f98b9ae61c4cd2bfb37fc13bcaa64f8f4c6ddf560eef88ba921b0c170205224f757eac5dc3dd08
+  data.tar.gz: 6b1e8f7b907218e6c9aaded19ba8dbc66040c857b0aea9eae3b3844475d256df3fb96f49f335c56bda63aa554af5491093df5f7fc811ececbf5d1bf723fe3149

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.4 (2015-11-29)
+
+Changes:
+
+* Define global_attributes instead of using attributes['global']
+* Let vagrant? to handle inside each host plugin
+
 # 0.1.3 (2015-11-26)
 
 Fixes:

data/README.md

@@ -142,7 +142,7 @@ attributes:
   nginx:
 ```
 
-The attributes variables are accessible like `attrs['rbenv']['versions']` in recipes, which is equivalent and short version of `node['attributes']['rbenv']['versions']`.
+The attributes variables are accessible like `attrs['rbenv']['versions']`, which is equivalent and short version of `node['attributes']['rbenv']['versions']` in recipes.
 
 You can also prepare host-specific property files such as:
 
@@ -159,12 +159,11 @@ In addition, you can also prepare environment property files such as:
 properties/environments/development.yml
 
 ```
-attributes:
-  global:
-    aws_region: ap-northeast-1
+global_attributes:
+  aws_region: ap-northeast-1
 ```
 
-The `global` is a reserved name, the `global` is used to only store global attributes, and do not run `global` recipe.
+where `global_attributes` is accessible like `global_attrs['aws_region']`, which is equivalent and short version of `node['global_attributes']['aws_region']` in recipes.
 
 These files are merged on kondate execution in order of `environment` + `role` + `node` (`node` > `role` > `environment` in the strong order).
 
@@ -281,7 +280,7 @@ module Kondate
       # @param [String] host hostname
       # @return [String] environment name
       def get_environment(host)
-        ENV['ENVIRONMENT']
+        ENV['ENVIRONMENT'] || 'development'
       end
 
       # @param [String] host hostname

data/lib/ext/itamae/attributes.rb

@@ -5,6 +5,9 @@ module Itamae
       def attrs
         node[:attributes]
       end
+      def global_attrs
+        node[:global_attributes]
+      end
     end
   end
 end
@@ -17,6 +20,9 @@ module Itamae
         def attrs
           node[:attributes]
         end
+        def global_attrs
+          node[:global_attributes]
+        end
       end
     end
   end
@@ -30,6 +36,9 @@ module Itamae
         def attrs
           node[:attributes]
         end
+        def global_attrs
+          node[:global_attributes]
+        end
       end
     end
   end

data/lib/ext/serverspec/attributes.rb

@@ -4,6 +4,9 @@ module Specinfra
       def attrs
         property['attributes']
       end
+      def global_attrs
+        property['global_attributes']
+      end
     end
   end
 end

data/lib/kondate/cli.rb

@@ -95,7 +95,6 @@ module Kondate
 
           ENV['TARGET_NODE_FILE'] = property_file
           recipes = YAML.load_file(property_file)['attributes'].keys.map {|recipe|
-            next if recipe == 'global'
             File.join(Config.middleware_recipes_serverspec_dir, recipe)
           }.compact
           recipes << File.join(Config.roles_recipes_serverspec_dir, role)
@@ -110,8 +109,11 @@ module Kondate
 
     def build_property_files(host)
       builder = PropertyBuilder.new(host)
-      roles   = @options[:role] ? builder.filter_roles(@options[:role]) : builder.roles
-      $stderr.puts 'No role' and exit(1) if roles.empty?
+      roles   = builder.filter_roles(@options[:role])
+      if roles.nil? or roles.empty?
+        $stderr.puts 'No role'
+        exit(1)
+      end
       $stdout.puts "roles: [#{roles.join(', ')}]"
 
       property_files = {}

data/lib/kondate/host_plugin/file.rb

@@ -17,7 +17,7 @@ module Kondate
       # @param [String] host hostname
       # @return [String] environment name
       def get_environment(host)
-        ENV['ENVIRONMENT']
+        ENV['ENVIRONMENT'] || 'development'
       end
 
       # @param [String] host hostname

data/lib/kondate/property_builder.rb

@@ -12,9 +12,9 @@ module Kondate
     def environment
       @environment ||=
         begin
-          vagrant? ? '' : Config.host_plugin.get_environment(@host)
+          Config.host_plugin.get_environment(@host) || ''
         rescue => e
-          $stderr.puts "cannot get environment from host:#{@host}, #{e.class} #{e.message}"
+          $stderr.puts "cannot get environment for host:#{@host}, #{e.class} #{e.message}"
           ''
         end
     end
@@ -22,15 +22,16 @@ module Kondate
     def roles
       @roles ||=
         begin
-          vagrant? ? [] : Config.host_plugin.get_roles(@host)
+          Config.host_plugin.get_roles(@host) || []
         rescue => e
-          $stderr.puts "cannot get roles from host:#{@host}, #{e.class} #{e.message}"
+          $stderr.puts "cannot get roles for host:#{@host}, #{e.class} #{e.message}"
           []
         end
     end
 
     def filter_roles(filters)
-      filters = Array(filters).map {|role| role.gsub(':', '-') }
+      return self.roles if filters.nil? or filters.empty?
+      filters = Array(filters).map {|filter| filter.gsub(':', '-') }
       if roles.empty? # maybe, development (vagrant) env
         @roles = filters # append specified roles
         @roles.each do |role|
@@ -46,7 +47,7 @@ module Kondate
         end
         unless filters.empty?
           # filter out for production env
-          @roles = roles & filters
+          @roles = self.roles & filters
         end
       end
       @roles
@@ -98,7 +99,6 @@ module Kondate
         'environment' => environment,
         'role'        => role,
         'roles'       => roles,
-        'attributes'  => {},
       }).
       deep_merge!(environment_property).
       deep_merge!(secret_environment_property).
@@ -109,7 +109,6 @@ module Kondate
 
       # filter out the recipe
       if filter_recipes and !filter_recipes.empty?
-        filter_recipes << 'global'
         property['attributes'].keys.each do |key|
           property['attributes'].delete(key) unless filter_recipes.include?(key)
         end

data/lib/kondate/templates/bootstrap.rb

@@ -3,7 +3,6 @@ require 'kondate'
 
 recipes = node['attributes'].keys
 recipes.each do |recipe|
-  next if recipe == 'global'
   include_recipe(File.join(Kondate::Config.middleware_recipes_dir, recipe, "default.rb"))
 end
 if File.exist?(File.join(Kondate::Config.roles_recipes_dir, node[:role], "default.rb"))

data/lib/kondate/templates/hosts.yml

@@ -1 +1,2 @@
 localhost: [sample]
+vagrant-centos: [sample]

data/lib/kondate/templates/properties/environments/development.yml

@@ -0,0 +1,2 @@
+global_attributes:
+  aws_region: ap-northeast-1

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -150,6 +150,7 @@ files:
 - lib/kondate/templates/bootstrap.rb
 - lib/kondate/templates/hosts.yml
 - lib/kondate/templates/properties/environments/.gitkeep
+- lib/kondate/templates/properties/environments/development.yml
 - lib/kondate/templates/properties/nodes/.gitkeep
 - lib/kondate/templates/properties/roles/sample.yml
 - lib/kondate/templates/recipes/middleware/base/default.rb