tsudura 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a0cc50d089c6684268f12056061ec7ec73c1188
-  data.tar.gz: cc9a3da81574fe2f66f23d4ca700db505c131610
+  metadata.gz: 9b155f3cd929cb971a844a1144bc7b7b45544d0c
+  data.tar.gz: d111161888b3a74e9b93a53acced7543d7ea11fb
 SHA512:
-  metadata.gz: e07c226d2633407ffe0bc50d448e565bd4af8222ed46fb7507094a440d54640d3dd789957921adf329842b4f90b231fa158800863ba7db714b9531354d2efd36
-  data.tar.gz: 8c90795ae969d758433ea03bc5facfd1ef5f87664ab20926327f460ec984ba81f61d24ad374e7d1ed8fdecbaad23f6f11f2fc2a8a35cdbd8f1d9b086a1893d9f
+  metadata.gz: e1b7bc3593e82f7738db39423c0b1c71a455dad03b3fae63cebb0a8423e02a4c34b6272b920443471ce9a656cdd33c3d062733b5da15763a3cc195d2307e4aba
+  data.tar.gz: c21e571f73d94468938653a4f1ccedd6f6d75e2fac587cff453a71c0d98e0cdd6e539927d25927462080fdb955119635b1ccd2041707ee36932cdadf89ce742f

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/onigra/tsudura.svg)](https://travis-ci.org/onigra/tsudura) [![Coverage Status](https://coveralls.io/repos/onigra/tsudura/badge.svg?branch=master)](https://coveralls.io/r/onigra/tsudura?branch=master) [![Code Climate](https://codeclimate.com/github/onigra/tsudura/badges/gpa.svg)](https://codeclimate.com/github/onigra/tsudura)
+[![Gem Version](https://badge.fury.io/rb/tsudura.svg)](http://badge.fury.io/rb/tsudura) [![Build Status](https://travis-ci.org/onigra/tsudura.svg)](https://travis-ci.org/onigra/tsudura) [![Coverage Status](https://coveralls.io/repos/onigra/tsudura/badge.svg?branch=master)](https://coveralls.io/r/onigra/tsudura?branch=master) [![Code Climate](https://codeclimate.com/github/onigra/tsudura/badges/gpa.svg)](https://codeclimate.com/github/onigra/tsudura) [![Dependency Status](https://gemnasium.com/onigra/tsudura.svg)](https://gemnasium.com/onigra/tsudura)
 
 # WARNING
 

data/lib/tsudura.rb

@@ -9,7 +9,9 @@ require "deep_hash_transform"
 
 require "tsudura/config_parser"
 require "tsudura/env_prefix"
+require "tsudura/progress_bar"
 require "tsudura/runners/runner_module"
+require "tsudura/runners/runner_module_with_message"
 require "tsudura/runners/normal_runner"
 require "tsudura/runners/packer_runner"
 require "tsudura/runners/packer_plus_runner"

data/lib/tsudura/aws/ami.rb

@@ -10,7 +10,7 @@ module Tsudura::Aws
   
     def create
       @new_image_id = create_ami
-      waiting_for_available @new_image_id
+      waiting_for_available
       @new_image_id
     end
      
@@ -38,12 +38,14 @@ module Tsudura::Aws
     #
     # stateがavailableになるまで待ち
     #
-    def waiting_for_available(new_image_id)
+    def waiting_for_available
       status = nil
+      progress = Tsudura::ProgressBar.new
   
       while (status.nil? || status == 'pending')
         sleep 10
-        status = ec2.describe_images(image_ids: [new_image_id])[:images].first.state
+        status = ec2.describe_images(image_ids: [@new_image_id])[:images].first.state
+        progress.write
       end
     end
 

data/lib/tsudura/aws/launch_instance.rb

@@ -37,6 +37,7 @@ module Tsudura::Aws
 
     def waiting_for_launch
       status = nil
+      progress = Tsudura::ProgressBar.new
 
       while (status.nil? || status == 'initializing')
         sleep 10
@@ -48,6 +49,7 @@ module Tsudura::Aws
         end
 
         status = statuses[:instance_statuses].first[:system_status].status
+        progress.write
       end
     end
 

data/lib/tsudura/progress_bar.rb

@@ -0,0 +1,13 @@
+module Tsudura
+  class ProgressBar
+    def initialize
+      @num = 1
+    end
+
+    def write
+      @num += 1
+      print "\rWaiting...#{'.' * @num}"
+      STDOUT.flush
+    end
+  end
+end

data/lib/tsudura/runners/normal_runner.rb

@@ -1,6 +1,7 @@
 module Tsudura::Runners
   class NormalRunner
     include Tsudura::Runners::RunnerModule
+    include Tsudura::Runners::RunnerModuleWithMessage
 
     def initialize(config)
       @config = config
@@ -8,12 +9,13 @@ module Tsudura::Runners
     end
 
     def run
-      instance_id = launch_instance
-      provision
-      new_image_id = create_ami(instance_id)
-      create_launch_config(new_image_id)
-      update_auto_scaling_group
-      destroy_temp_objects
+      launch_instance_with_m
+      provision_with_m
+      create_ami_with_m
+      create_launch_config_with_m
+      update_auto_scaling_group_with_m
+      destroy_temp_objects_with_m
+      puts "Success!!"
     end
   end
 end

data/lib/tsudura/runners/packer_plus_runner.rb

@@ -1,6 +1,7 @@
 module Tsudura::Runners
   class PackerPlusRunner
     include Tsudura::Runners::RunnerModule
+    include Tsudura::Runners::RunnerModuleWithMessage
 
     def initialize(config)
       @config = config
@@ -8,11 +9,12 @@ module Tsudura::Runners
     end
 
     def run
-      instance_id = launch_instance
-      provision
-      new_image_id = create_ami(instance_id)
-      create_launch_config(new_image_id)
-      terminate_tmp_ec2_instance
+      launch_instance_with_m
+      provision_with_m
+      create_ami_with_m
+      create_launch_config_with_m
+      terminate_tmp_ec2_instance_with_m
+      puts "Success!!"
     end
   end
 end

data/lib/tsudura/runners/packer_runner.rb

@@ -1,6 +1,7 @@
 module Tsudura::Runners
   class PackerRunner
     include Tsudura::Runners::RunnerModule
+    include Tsudura::Runners::RunnerModuleWithMessage
 
     def initialize(config)
       @config = config
@@ -8,10 +9,11 @@ module Tsudura::Runners
     end
 
     def run
-      instance_id = launch_instance
-      provision
-      puts create_ami(instance_id)
-      terminate_tmp_ec2_instance
+      launch_instance_with_m
+      provision_with_m
+      create_ami_with_m
+      terminate_tmp_ec2_instance_with_m
+      puts "Success!!"
     end
   end
 end

data/lib/tsudura/runners/runner_module.rb

@@ -5,20 +5,20 @@ module Tsudura::Runners
   
     def launch_instance
       @ec2 = Tsudura::Aws::LaunchInstance.new(@config)
-      @ec2.launch
+      @tmp_instance_id = @ec2.launch
     end
   
     def provision
       Tsudura::Provisioner::Ansible.new(@config).provision!
     end
   
-    def create_ami(instance_id)
-      @ami = Tsudura::Aws::Ami.new(instance_id, @config, @timestamp)
-      @ami.create
+    def create_ami
+      @ami = Tsudura::Aws::Ami.new(@tmp_instance_id, @config, @timestamp)
+      @new_image_id = @ami.create
     end
   
-    def create_launch_config(new_image_id)
-      @launch_config = Tsudura::Aws::LaunchConfig.new(new_image_id, @config, @timestamp)
+    def create_launch_config
+      @launch_config = Tsudura::Aws::LaunchConfig.new(@new_image_id, @config, @timestamp)
       @launch_config.create
     end
     
@@ -27,9 +27,9 @@ module Tsudura::Runners
     end
   
     def destroy_temp_objects
-      @ec2.terminate
-      @ami.deregister
-      @launch_config.delete
+      terminate_tmp_ec2_instance
+      deregister_old_ami
+      delete_old_launch_config
     end
     
     def terminate_tmp_ec2_instance

data/lib/tsudura/runners/runner_module_with_message.rb

@@ -0,0 +1,64 @@
+module Tsudura::Runners
+  module RunnerModuleWithMessage
+
+    private
+  
+    def launch_instance_with_m
+      puts "Launch instance"
+      launch_instance
+      puts "\nLaunch tmp instance: #{@tmp_instance_id}"
+      puts "Finish!!"
+    end
+  
+    def provision_with_m
+      puts "Start provisioning"
+      provision
+      puts "Finish!!"
+    end
+  
+    def create_ami_with_m
+      puts "Create ami"
+      create_ami
+      puts "\nNew image id: #{@new_image_id}"
+      puts "Finish!!"
+    end
+  
+    def create_launch_config_with_m
+      puts "Create launch config"
+      create_launch_config
+      puts "New launch config name: #{@config[:service]}-#{short_env}-#{@timestamp}"
+      puts "Finish!!"
+    end
+    
+    def update_auto_scaling_group_with_m
+      puts "update auto scaling group"
+      update_auto_scaling_group
+      puts "Finish!!"
+    end
+  
+    def destroy_temp_objects_with_m
+      terminate_tmp_ec2_instance_with_m
+      deregister_old_ami_with_m
+      delete_old_launch_config_with_m
+    end
+    
+    def terminate_tmp_ec2_instance_with_m
+      puts "Terminate instance"
+      terminate_tmp_ec2_instance
+    end
+
+    def deregister_old_ami_with_m
+      puts "Deregister old ami"
+      deregister_old_ami
+    end
+    
+    def delete_old_launch_config_with_m
+      puts "Delete old launch config"
+      delete_old_launch_config
+    end
+
+    def short_env
+      Tsudura::EnvPrefix.short @config[:environment]
+    end
+  end
+end

data/lib/tsudura/version.rb

@@ -1,3 +1,3 @@
 module Tsudura
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsudura
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - onigra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,12 +193,14 @@ files:
 - lib/tsudura/cli.rb
 - lib/tsudura/config_parser.rb
 - lib/tsudura/env_prefix.rb
+- lib/tsudura/progress_bar.rb
 - lib/tsudura/provisioner/ansible.rb
 - lib/tsudura/runner.rb
 - lib/tsudura/runners/normal_runner.rb
 - lib/tsudura/runners/packer_plus_runner.rb
 - lib/tsudura/runners/packer_runner.rb
 - lib/tsudura/runners/runner_module.rb
+- lib/tsudura/runners/runner_module_with_message.rb
 - lib/tsudura/version.rb
 - tsudura.gemspec
 homepage: https://github.com/onigra/tsudura