tsudura 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13dfb65a1d975c7bf415a9584a22a69ff2307b3f
-  data.tar.gz: e5f47a5185e211193610d732219990eabcea366d
+  metadata.gz: 56a4955ff27b07868427adff391a2c354728b695
+  data.tar.gz: 8a3fa23722dcb6c0d4c80b790db0c932b3370cc3
 SHA512:
-  metadata.gz: 24009755f26a5ee60d759b07fe95cf5a3a7a22f00c4540b728ba9d9a2d97c009df08506ffdd4bac778652ac943327a540eec2232acb8a2d3c5446984c061531f
-  data.tar.gz: 75462483d1774d6c06e8c02a6358ebde5eba59b92db4ea4b85dd5cfb7025f23400b521f91b6f10a165ef19df696ec9e2ff92c0d97400f500c5ac4df59c8fbff2
+  metadata.gz: 205d6370da4f3f30048c273cba79e9bd650b7fd73218e33704fa800af2ba6617bdbf4bcbaedaa1837b11ccd5494c3ab2e95bad56a43a8cfe433119b2b15050f7
+  data.tar.gz: ba6d4ab8c6e10642409ccc4b85aee214846a514e87cf4fbfaed381377f5903d1adabd1b458dc83c8d2ad070af985bc3d68d0b0dc90d2fe6e8dfc2584ea2abfd9

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /vendor/bundle
+.envrc

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 2.2.2
+  - 2.2.3
 before_script:
   - export COVERAGE=true
 script:

data/lib/tsudura/aws/launch_config.rb

@@ -7,16 +7,15 @@ module Tsudura::Aws
       @config = config
       @timestamp = timestamp
     end
+
+    def options
+      option = base_option
+      option[:iam_instance_profile] = @config[:iam_instance_profile] if @config[:iam_instance_profile]
+      option
+    end
   
     def create
-      @new_launch_config = autoscaling.create_launch_configuration(
-        image_id: @image_id,
-        key_name: @config[:key_name],
-        user_data: Base64.encode64(@config[:user_data_script]),
-        instance_type: @config[:instance_type],
-        security_groups: [@config[:security_group_id]],
-        launch_configuration_name: "#{@config[:service]}-#{short_env}-#{@timestamp}",
-      )
+      @new_launch_config = autoscaling.create_launch_configuration(options)
     end
 
     def delete
@@ -50,5 +49,16 @@ module Tsudura::Aws
       autoscaling.describe_launch_configurations.each_page { |i| tmp.concat i.launch_configurations }
       tmp.select { |i| i[:launch_configuration_name] =~ /#{@config[:service]}-#{short_env}/ }.map(&:launch_configuration_name)
     end
+
+    def base_option
+      {
+        image_id: @image_id,
+        key_name: @config[:key_name],
+        user_data: Base64.encode64(@config[:user_data_script]),
+        instance_type: @config[:instance_type],
+        security_groups: [@config[:security_group_id]],
+        launch_configuration_name: "#{@config[:service]}-#{short_env}-#{@timestamp}",
+      }
+    end
   end
 end

data/lib/tsudura/provisioner/ansible/command.rb

@@ -0,0 +1,11 @@
+module Tsudura::Provisioner
+  module Ansible
+    class Command
+      def self.exec(config)
+        Open3.popen3(CommandGenerator.new(config).generate) do |i, o, e, w|
+          o.each do |line| puts line end
+        end
+      end
+    end
+  end
+end

data/lib/tsudura/provisioner/ansible/command_generator.rb

@@ -0,0 +1,44 @@
+module Tsudura::Provisioner
+  module Ansible
+    class CommandGenerator
+      def initialize(config)
+        @config = config
+      end
+
+      def generate
+         exec_command = []
+         exec_command << base_command
+         exec_command << vault_option if use_vault_option?
+         exec_command.join(" ")
+      end
+
+      def use_vault_option?
+        @config[:vault_password] ? true : false
+      end
+
+      private
+
+      def base_command
+        "ansible-playbook #{@config[:playbook_path]} -i #{@config[:inventory_file]}"
+      end
+
+      def vault_option
+        create_vault_password_file
+        vault_password_file_option
+      end
+
+      def create_vault_password_file
+        tmp_password_file << @config[:vault_password]
+        tmp_password_file.close
+      end
+
+      def vault_password_file_option
+        "--vault-password-file #{tmp_password_file.path}"
+      end
+
+      def tmp_password_file
+        @tmp_password_file ||= Tempfile.new("tsudura.#{@config[:service]}")
+      end
+    end
+  end
+end

data/lib/tsudura/runners/runner_module.rb

@@ -9,7 +9,7 @@ module Tsudura::Runners
     end
   
     def provision
-      Tsudura::Provisioner::Ansible.new(@config).provision!
+      Tsudura::Provisioner::Ansible::Command.exec @config
     end
   
     def create_ami

data/lib/tsudura/version.rb

@@ -1,3 +1,3 @@
 module Tsudura
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/tsudura.rb

@@ -25,4 +25,6 @@ require "tsudura/aws/ami"
 require "tsudura/aws/auto_scale"
 require "tsudura/aws/launch_config"
 require "tsudura/aws/launch_instance"
-require "tsudura/provisioner/ansible"
+
+require "tsudura/provisioner/ansible/command"
+require "tsudura/provisioner/ansible/command_generator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsudura
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - onigra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -194,7 +194,8 @@ files:
 - lib/tsudura/config_parser.rb
 - lib/tsudura/env_prefix.rb
 - lib/tsudura/progress_bar.rb
-- lib/tsudura/provisioner/ansible.rb
+- lib/tsudura/provisioner/ansible/command.rb
+- lib/tsudura/provisioner/ansible/command_generator.rb
 - lib/tsudura/runner.rb
 - lib/tsudura/runners/normal_runner.rb
 - lib/tsudura/runners/packer_plus_runner.rb
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Update ami and launch_config and auto scaling group like packer.

data/lib/tsudura/provisioner/ansible.rb

@@ -1,48 +0,0 @@
-module Tsudura::Provisioner
-  class Ansible
-    def initialize(config)
-      @config = config
-    end
-  
-    def provision!
-      command = base_command
-
-      if use_vault_option?
-        command << add_vault_option
-      end
-
-      Open3.popen3 command do |i, o, e, w|
-        o.each do |line| puts line end
-      end
-    ensure
-      remove_vault_password_file if use_vault_option?
-    end
-
-    private
-
-    def base_command
-      "ansible-playbook #{@config[:playbook_path]} -i #{@config[:inventory_file]}"
-    end
-
-    def use_vault_option?
-      @config[:vault_password] ? true : false
-    end
-
-    def add_vault_option
-      create_vault_password_file
-      vault_option
-    end
-
-    def vault_option
-      " --vault-password-file tmp_password_file"
-    end
-
-    def create_vault_password_file
-      File.open("tmp_password_file", "w") { |f| f.puts @config[:vault_password] }
-    end
-
-    def remove_vault_password_file
-      FileUtils.rm "tmp_password_file"
-    end
-  end
-end