tsudura 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 454145fa9c659a5e7a32d21490baea4945325605
-  data.tar.gz: 6dc9088693f930d1de1caeeab5e991433dd0af1e
+  metadata.gz: 8a0cc50d089c6684268f12056061ec7ec73c1188
+  data.tar.gz: cc9a3da81574fe2f66f23d4ca700db505c131610
 SHA512:
-  metadata.gz: 67440826f71c227b3234314a647225869475e70e9d040c7aaca717e3f19df10b1468ed4dba0a7b78b4d67243d680e4ce36ee0b35caa400b6ee85d4c08deccc30
-  data.tar.gz: 0125a58832b60877e1d11332c6db6947a37bace5ebbf9af631eabaf1a656d648653b66654ea555df58525f86cb521a49540d6cb6d83398ae187c28ba91e316b5
+  metadata.gz: e07c226d2633407ffe0bc50d448e565bd4af8222ed46fb7507094a440d54640d3dd789957921adf329842b4f90b231fa158800863ba7db714b9531354d2efd36
+  data.tar.gz: 8c90795ae969d758433ea03bc5facfd1ef5f87664ab20926327f460ec984ba81f61d24ad374e7d1ed8fdecbaad23f6f11f2fc2a8a35cdbd8f1d9b086a1893d9f

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
   - 2.2.2
-script: bundle exec rspec
+before_script:
+  - export COVERAGE=true
+script:
+  - bundle exec rspec

data/Guardfile

@@ -1,5 +1,4 @@
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features)
+directories %w(lib spec)
 
 ## Uncomment to clear the screen before every task
 # clearing :on

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/onigra/tsudura.svg)](https://travis-ci.org/onigra/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)
 
 # WARNING
 

data/lib/tsudura.rb

@@ -9,9 +9,10 @@ require "deep_hash_transform"
 
 require "tsudura/config_parser"
 require "tsudura/env_prefix"
-require "tsudura/runner_module"
-require "tsudura/normal_runner"
-require "tsudura/packer_plus_runner"
+require "tsudura/runners/runner_module"
+require "tsudura/runners/normal_runner"
+require "tsudura/runners/packer_runner"
+require "tsudura/runners/packer_plus_runner"
 require "tsudura/runner"
 require "tsudura/cli"
 require "tsudura/version"

data/lib/tsudura/aws/launch_instance.rb

@@ -6,11 +6,10 @@ module Tsudura::Aws
     end
   
     def launch
-      instance_result = launch_ec2
-      instance = instance_result[:instances].first
-      waiting_for_launch instance
-      ec2.create_tags(resources: [instance.instance_id], tags: [ { key: 'Name', value: "#{@config[:service]}-ami"}])
-      @launched_instance_id = instance.instance_id
+      launch_result = launch_ec2
+      @launched_instance_id = launch_result[:instances].first.instance_id
+      waiting_for_launch
+      create_tag
       @launched_instance_id
     end
   
@@ -19,27 +18,11 @@ module Tsudura::Aws
     end
   
     private
-  
-    #
-    # statusがreadyになるまで待ち
-    #
-    def waiting_for_launch(instance)
-      status = nil
-  
-      while (status.nil? || status == 'initializing')
-        sleep 10
-  
-        statuses = ec2.describe_instance_status(instance_ids: [instance.instance_id])
-        if statuses[:instance_statuses] == []
-          #  早過ぎると、ステータス取得すらできない
-          next
-        end
-  
-        status = statuses[:instance_statuses].first[:system_status].status
-        puts status
-      end
+
+    def ec2
+      @ec2 ||= ::Aws::EC2::Client.new(region: @config[:region])
     end
-  
+
     def launch_ec2
       ec2.run_instances(
         min_count: 1,
@@ -52,8 +35,24 @@ module Tsudura::Aws
       )
     end
 
-    def ec2
-      @ec2 ||= ::Aws::EC2::Client.new(region: @config[:region])
+    def waiting_for_launch
+      status = nil
+
+      while (status.nil? || status == 'initializing')
+        sleep 10
+        statuses = ec2.describe_instance_status(instance_ids: [@launched_instance_id])
+
+        # 早すぎるとステータスの取得すらできない
+        if statuses[:instance_statuses] == []
+          next
+        end
+
+        status = statuses[:instance_statuses].first[:system_status].status
+      end
+    end
+
+    def create_tag
+      ec2.create_tags(resources: [@launched_instance_id], tags: [ { key: 'Name', value: "#{@config[:service]}-ami"}])
     end
   end
 end

data/lib/tsudura/runner.rb

@@ -2,9 +2,9 @@ module Tsudura
   class Runner
     def self.run(config)
       if config.has_key?(:mode)
-        Object.const_get("Tsudura").const_get("#{config[:mode].split("_").map(&:capitalize).join}Runner").new(config).run
+        Object.const_get("Tsudura").const_get("Runners").const_get("#{config[:mode].split("_").map(&:capitalize).join}Runner").new(config).run
       else
-        Tsudura::NormalRunner.new(config).run
+        Tsudura::Runners::NormalRunner.new(config).run
       end
     end
   end

data/lib/tsudura/{normal_runner.rb → runners/normal_runner.rb}

@@ -1,6 +1,6 @@
-module Tsudura
+module Tsudura::Runners
   class NormalRunner
-    include Tsudura::RunnerModule
+    include Tsudura::Runners::RunnerModule
 
     def initialize(config)
       @config = config

data/lib/tsudura/{packer_plus_runner.rb → runners/packer_plus_runner.rb}

@@ -1,6 +1,6 @@
-module Tsudura
+module Tsudura::Runners
   class PackerPlusRunner
-    include Tsudura::RunnerModule
+    include Tsudura::Runners::RunnerModule
 
     def initialize(config)
       @config = config

data/lib/tsudura/runners/packer_runner.rb

@@ -0,0 +1,17 @@
+module Tsudura::Runners
+  class PackerRunner
+    include Tsudura::Runners::RunnerModule
+
+    def initialize(config)
+      @config = config
+      @timestamp = Time.now.strftime('%Y%m%d%H%M%S')
+    end
+
+    def run
+      instance_id = launch_instance
+      provision
+      puts create_ami(instance_id)
+      terminate_tmp_ec2_instance
+    end
+  end
+end

data/lib/tsudura/{runner_module.rb → runners/runner_module.rb}

@@ -1,29 +1,29 @@
-module Tsudura
+module Tsudura::Runners
   module RunnerModule
 
     private
   
     def launch_instance
-      @ec2 = Aws::LaunchInstance.new(@config)
+      @ec2 = Tsudura::Aws::LaunchInstance.new(@config)
       @ec2.launch
     end
   
     def provision
-      Provisioner::Ansible.new(@config).provision!
+      Tsudura::Provisioner::Ansible.new(@config).provision!
     end
   
     def create_ami(instance_id)
-      @ami = Aws::Ami.new(instance_id, @config, @timestamp)
+      @ami = Tsudura::Aws::Ami.new(instance_id, @config, @timestamp)
       @ami.create
     end
   
     def create_launch_config(new_image_id)
-      @launch_config = Aws::LaunchConfig.new(new_image_id, @config, @timestamp)
+      @launch_config = Tsudura::Aws::LaunchConfig.new(new_image_id, @config, @timestamp)
       @launch_config.create
     end
     
     def update_auto_scaling_group
-      Aws::AutoScale.new(@config, @timestamp).update
+      Tsudura::Aws::AutoScale.new(@config, @timestamp).update
     end
   
     def destroy_temp_objects

data/lib/tsudura/version.rb

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

data/tsudura.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "growl"
   spec.add_development_dependency "awesome_print"
+  spec.add_development_dependency "coveralls"
 
   spec.add_dependency "thor"
   spec.add_dependency "aws-sdk", '~> 2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsudura
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - onigra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -179,11 +193,12 @@ files:
 - lib/tsudura/cli.rb
 - lib/tsudura/config_parser.rb
 - lib/tsudura/env_prefix.rb
-- lib/tsudura/normal_runner.rb
-- lib/tsudura/packer_plus_runner.rb
 - lib/tsudura/provisioner/ansible.rb
 - lib/tsudura/runner.rb
-- lib/tsudura/runner_module.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/version.rb
 - tsudura.gemspec
 homepage: https://github.com/onigra/tsudura