kumogata 0.2.18 → 0.2.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2RiMjE5OGYxYmZkY2NiZDBkNzBjMGE0ZTdkN2UwMzE5OWRhZjJjMQ==
+    OTIzZjQ1YzM3MGFkNzQ0YmRiMjYyMDFlMjVmYjEwMjgzNTliZDU2Mg==
   data.tar.gz: !binary |-
-    MmE4MGE2NTQwMGQ5MTAxZDZkYzEwMjVmNWU3NjA1MzUxODhiMjFhNg==
+    ZTA2ZjU5YTc1YTRjMjE4ZGY0NWUzNzM1ZTBhNjljMDBjNmY4NzhlYQ==
 SHA512:
   metadata.gz: !binary |-
-    ODlkMTM4MTdmMDJiMTBlMjY3MzM5MDEzZDY4MzBjYzE2M2FmY2MxM2M3ZjI0
-    OTM4ODdhZDZkOWQ1NWU1NmFiZGQzODFhZGMyYjViMTRmMDJmYzQ4OTQ2MjIz
-    M2VjNzUwZTAyOGU5YzQzYTM2YjI0M2Q0NWFhYzQyNTMwNjk0YzM=
+    ZmU2OWY3YzBjM2QwYjE1ZjQ0OGE3ZGE0ZmYwOGQ2MDdhNzIxOWM5MGE3YjMx
+    YjgwYjRhMmY0Y2MzMWI4OTFiMmFmMmQxZjRmNzQxNmFmNTZjNGEwZDllZmNh
+    MDU3ZWVmMmYyZDkzOTEzYzEzZDk4OGJjOTQxOWZjMTVhYmRlOGU=
   data.tar.gz: !binary |-
-    ZDFmODJiOTYyNmE0MTg4ZDkxMzllZWMyYjg2NGE5ZDFiNWM3MmU1NzIxMjcy
-    NDdjMTk5MWI3ZTdkYWM1ZThjZTI3M2IwYzFkMzdjNDM5ZTcxNmE5ZTVmNDgx
-    NTA4YTAyZGFjZmZmZDk1YjBhOTc5YmE3NWU1ZTc5ZmU1NTIyNTY=
+    ZjFmZmRjMmY5ODE0MzRhOWQxMmE5MDE4N2ExZmI0YmEwMTllZjA1YWE5ODNk
+    N2MyN2NlNzQwYzI4MWZiZTVjZmM3MTVlZTFkMGQ1MDlkYTkzODVjNzczNDhm
+    MzAwY2IxYjU1MzJjMDU2OTRmYmY3ZGI0ODA1NDY5MzBhYjc1MjU=

data/README.md

@@ -5,8 +5,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403072326)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403072326)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403072353)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403072353)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 

data/lib/kumogata.rb

@@ -24,3 +24,4 @@ require 'kumogata/ext/coderay_ext'
 require 'kumogata/ext/json_ext'
 require 'kumogata/ext/string_ext'
 require 'kumogata/logger'
+require 'kumogata/utils'

data/lib/kumogata/client.rb

@@ -202,7 +202,16 @@ class Kumogata::Client
   end
 
   def create_stack(template, stack_name)
-    stack_name = stack_name || 'kumogata-' + UUIDTools::UUID.timestamp_create
+    unless stack_name
+      user_host = Kumogata::Utils.get_user_host
+
+      stack_name = ['kumogata']
+      stack_name << user_host if user_host
+      stack_name << UUIDTools::UUID.timestamp_create
+
+      stack_name = stack_name.join('-')
+      stack_name.gsub!(/[^-a-zA-Z0-9]+/, '-')
+    end
 
     Kumogata.logger.info("Creating stack: #{stack_name}".cyan)
     stack = @cloud_formation.stacks.create(stack_name, template.to_json, build_create_options)
@@ -408,7 +417,7 @@ class Kumogata::Client
         :stack_name,
         :timestamp,
       ].each do |k|
-        event_hash[camelize(k)] = event.send(k)
+        event_hash[Kumogata::Utils.camelize(k)] = event.send(k)
       end
 
       event_hash
@@ -437,7 +446,7 @@ class Kumogata::Client
         :resource_status_reason,
         :last_updated_timestamp
       ].each do |k|
-        summary_hash[camelize(k)] = summary[k]
+        summary_hash[Kumogata::Utils.camelize(k)] = summary[k]
       end
 
       summary_hash
@@ -465,12 +474,6 @@ Stack Resource Summaries:
     end
   end
 
-  def camelize(str)
-    str.to_s.split(/[-_]/).map {|i|
-      i[0, 1].upcase + i[1..-1].downcase
-    }.join
-  end
-
   def validate_stack_name(stack_name)
     return unless stack_name
 

data/lib/kumogata/utils.rb

@@ -0,0 +1,16 @@
+class Kumogata::Utils
+  class << self
+    def camelize(str)
+      str.to_s.split(/[-_]/).map {|i|
+        i[0, 1].upcase + i[1..-1].downcase
+      }.join
+    end
+
+    def get_user_host
+      user = `whoami`.strip rescue ''
+      host = `hostname`.strip rescue ''
+      user_host = [user, host].select {|i| not i.empty? }.join('-')
+      user_host.empty? ? nil : user_host
+    end
+  end # of class methods
+end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.2.18'
+  VERSION = '0.2.19'
 end

data/spec/kumogata_create_spec.rb

@@ -48,9 +48,9 @@ end
 
       stacks = make_double('stacks') do |obj|
         obj.should_receive(:create)
-           .with('kumogata-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {}) { stack }
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {}) { stack }
         obj.should_receive(:[])
-           .with('kumogata-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
       end
 
       cf.should_receive(:stacks).twice { stacks }
@@ -114,9 +114,9 @@ end
 
       stacks = make_double('stacks') do |obj|
         obj.should_receive(:create)
-           .with('kumogata-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {:parameters=>{"InstanceType"=>"m1.large"}}) { stack }
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {:parameters=>{"InstanceType"=>"m1.large"}}) { stack }
         obj.should_receive(:[])
-           .with('kumogata-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
       end
 
       cf.should_receive(:stacks).twice { stacks }
@@ -261,9 +261,9 @@ end
 
       stacks = make_double('stacks') do |obj|
         obj.should_receive(:create)
-           .with('kumogata-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {:parameters=>{"InstanceType"=>"m1.large"}}) { stack }
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', json, {:parameters=>{"InstanceType"=>"m1.large"}}) { stack }
         obj.should_receive(:[])
-           .with('kumogata-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
+           .with('kumogata-user-host-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') { stack }
       end
 
       cf.should_receive(:stacks).twice { stacks }

data/spec/spec_helper.rb

@@ -6,6 +6,12 @@ class UUIDTools::UUID
   def self.timestamp_create; 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'; end
 end
 
+class Kumogata::Utils
+  def self.get_user_host
+    'user-host'
+  end
+end
+
 def tempfile(content, template_ext)
   basename = "#{File.basename __FILE__}.#{$$}"
   basename = [basename, template_ext]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Genki Sugawara
@@ -202,6 +202,7 @@ files:
 - lib/kumogata/ext/json_ext.rb
 - lib/kumogata/ext/string_ext.rb
 - lib/kumogata/logger.rb
+- lib/kumogata/utils.rb
 - lib/kumogata/version.rb
 - packer/CentOS-6.4-x86_64-with_Updates-Asia_Pacific.json
 - packer/Ubuntu-12.04.4-LTS-x86_64-ebs-Asia_Pacific.json