kelbim 0.3.1.beta2 → 0.3.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22165f5f97872d15363922b62b96e54f456df68e
-  data.tar.gz: 802e0593b150f7c251a21e9f6e39094c93fd4853
+  metadata.gz: 946b1efa8b0465ff57a4cf034aa96718b7b634b0
+  data.tar.gz: e5981c6807626c6453ab6f3ac9c501e49ba9ef1f
 SHA512:
-  metadata.gz: 44286e575763ce0906581e16ce88c1432313dc5d135412ba7472fe67827ab192dd2efb28b75429464c0443fbb6d5e647787c5683e15dc5562dc03b960bc208e5
-  data.tar.gz: 95f1231e72915d67a10272446005a1585101f24fed8868af854774d9e6fb91bc67da3560ec3fefa1d44733b529a540adc477b776e6b0a850e74bef77ae7554ed
+  metadata.gz: dc80b4de4adea9d1edeee91322999e37cd7827bea630f35bbc89c62b761bea20f26586a49e85f7ca8de921024bba74cafce2dbb2559759a4d1522bbea0d1978e
+  data.tar.gz: 6c58a999f82449216d5d9da254d3bb23fe69e2b65dd68853e1e330d2c3966067419de1222aa35633eda5417c68b4bed106d632a26eb65f04eea8e4b05f2f2148

data/bin/kelbim~

@@ -0,0 +1,187 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+$: << File.expand_path("#{File.dirname __FILE__}/../lib")
+require 'rubygems'
+require 'fileutils'
+require 'json'
+require 'kelbim'
+require 'optparse'
+require 'rspec'
+require 'kelbim/rspec-formatter'
+
+DEFAULT_FILENAME = 'ELBfile'
+
+mode = nil
+file = DEFAULT_FILENAME
+output_file = '-'
+split = false
+
+options = {
+  :dry_run     => false,
+  :color       => true,
+  :debug       => false,
+}
+
+ARGV.options do |opt|
+  begin
+    access_key = nil
+    secret_key = nil
+    region = nil
+    profile_name = nil
+    credentials_path = nil
+
+    opt.on('-p', '--profile PROFILE_NAME')    {|v| profile_name                      = v                    }
+    opt.on(''  , '--credentials-path PATH')   {|v| credentials_path                  = v                    }
+    opt.on('-k', '--access-key ACCESS_KEY')   {|v| access_key                        = v                    }
+    opt.on('-s', '--secret-key SECRET_KEY')   {|v| secret_key                        = v                    }
+    opt.on('-r', '--region REGION')           {|v| region                            = v                    }
+    opt.on('-a', '--apply')                   {    mode                              = :apply               }
+    opt.on('-f', '--file FILE')               {|v| file                              = v                    }
+    opt.on('-n', '--elb-name REGEXP')         {|v| options[:elb_name]                =  Regexp.new(v)       }
+    opt.on('',   '--exclude-elb-name REGEXP') {|v| options[:exclude_elb_name]        =  Regexp.new(v)       }
+    opt.on('',   '--dry-run')                 {    options[:dry_run]                 = true                 }
+    opt.on('',   '--ec2s VPC_IDS', Array)     {|v| options[:ec2s]                    = v                    }
+    opt.on('',   '--without-deleting-policy') {    options[:without_deleting_policy] = true                 }
+    opt.on('-e', '--export')                  {    mode                              = :export              }
+    opt.on('-o', '--output FILE')             {|v| output_file                       = v                    }
+    opt.on('',   '--split')                   {    split                             = true                 }
+    opt.on('',   '--split-more')              {    split                             = :more                }
+    opt.on('-t', '--test')                    {    mode                              = :test                }
+    opt.on('',   '--show-load-balancers')     {    mode                              = :show_load_balancers }
+    opt.on('',   '--show-policies')           {    mode                              = :show_policies       }
+    opt.on(''  , '--no-color')                {    options[:color]                   = false                }
+    opt.on(''  , '--debug')                   {    options[:debug]                   = true                 }
+    opt.parse!
+
+    aws_opts = {}
+    if access_key and secret_key
+      aws_opts[:access_key_id] = access_key
+      aws_opts[:secret_access_key] = secret_key
+    elsif profile_name or credentials_path
+      credentials_opts = {}
+      credentials_opts[:profile_name] = profile_name if profile_name
+      credentials_opts[:path] = credentials_path if credentials_path
+      provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(credentials_opts)
+      aws_opts[:credential_provider] = provider
+    elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
+      puts opt.help
+      exit 1
+    end
+
+    aws_opts[:region] = region if region
+    AWS.config(aws_opts)
+  rescue => e
+    $stderr.puts("[ERROR] #{e.message}")
+    exit 1
+  end
+end
+
+String.colorize = options[:color]
+
+if options[:debug]
+  AWS.config({
+    :http_wire_trace => true,
+    :logger => Kelbim::Logger.instance,
+  })
+end
+
+begin
+  logger = Kelbim::Logger.instance
+  logger.set_debug(options[:debug])
+  client = Kelbim::Client.new(options)
+
+  case mode
+  when :export
+    if split
+      logger.info('Export ELB')
+
+      output_file = DEFAULT_FILENAME if output_file == '-'
+      requires = []
+
+      client.export(options) do |exported, converter|
+        exported.each do |vpc, elbs|
+          if split == :more
+            elb_dir = File.join(File.dirname(output_file), "#{vpc || :classic}")
+            FileUtils.mkdir_p(elb_dir)
+
+            elbs.each do |name, attrs|
+              elb_file = File.join(elb_dir, "#{name}.elb")
+              requires << elb_file
+
+              logger.info("  write `#{elb_file}`")
+
+              open(elb_file, 'wb') do |f|
+                f.puts converter.call(vpc => {name => attrs})
+              end
+            end
+          else
+            elb_file = File.join(File.dirname(output_file), "#{vpc || :classic}.elb")
+            requires << elb_file
+
+            logger.info("  write `#{elb_file}`")
+
+            open(elb_file, 'wb') do |f|
+              f.puts converter.call(vpc => elbs)
+            end
+          end
+        end
+      end
+
+      logger.info("  write `#{output_file}`")
+      path_prefix = File.dirname(output_file)
+
+      open(output_file, 'wb') do |f|
+        requires.each do |elb_file|
+          elb_file.sub!(%r|\A#{Regexp.escape(path_prefix)}/|, '')
+          f.puts "require '#{elb_file}'"
+        end
+      end
+    else
+      if output_file == '-'
+        logger.info('# Export ELB')
+        puts client.export(options)
+      else
+        logger.info("Export ELB to `#{output_file}`")
+        open(output_file, 'wb') {|f| f.puts client.export(options) }
+      end
+    end
+  when :apply
+    unless File.exist?(file)
+      raise "No ELBfile found (looking for: #{file})"
+    end
+
+    msg = "Apply `#{file}` to ELB"
+    msg << ' (dry-run)' if options[:dry_run]
+    logger.info(msg)
+
+    updated = client.apply(file)
+
+    logger.info('No change'.intense_blue) unless updated
+  when :test
+    unless File.exist?(file)
+      raise "No ELBfile found (looking for: #{file})"
+    end
+
+    RSpec.configure do |config|
+      config.color = options[:color]
+      config.output_stream = $stdout # formatterをセットする前に設定…
+      config.formatter = Kelbim::RSpecFormatter
+    end
+
+    logger.info("Test `#{file}`")
+    client.test(file)
+  when :show_load_balancers
+    puts JSON.pretty_generate(client.load_balancers)
+  when :show_policies
+    puts JSON.pretty_generate(client.policies)
+  else
+    raise 'must not happen'
+  end
+rescue => e
+  if options[:debug]
+    raise e
+  else
+    $stderr.puts("[ERROR] #{e.message}".red)
+    exit 1
+  end
+end

data/lib/kelbim/version.rb

@@ -1,5 +1,5 @@
 module Kelbim
-  VERSION = "0.3.1.beta2"
+  VERSION = "0.3.1.beta3"
 end
 
 Version = Kelbim::VERSION

data/lib/kelbim/wrapper/policy.rb

@@ -26,9 +26,11 @@ module Kelbim
                     @policy.name == dsl_name_or_attrs
                   else
                     aws_attrs = PolicyTypes.expand(@policy.type, @policy.attributes)
-                    aws_attrs.each do |name, value|
-                      value = value[0] if value.length < 2
-                      aws_attrs[name] = value
+                    if aws_attrs.is_a?(Hash)
+                      aws_attrs.each do |name, value|
+                        value = value[0] if value.length < 2
+                        aws_attrs[name] = value
+                      end
                     end
                     aws_attrs.sort == dsl_name_or_attrs.sort
                   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.3.1.beta2
+  version: 0.3.1.beta3
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -156,11 +156,13 @@ email:
 - sgwr_dts@yahoo.co.jp
 executables:
 - kelbim
+- kelbim~
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/kelbim
+- bin/kelbim~
 - lib/kelbim.rb
 - lib/kelbim/client.rb
 - lib/kelbim/dsl.rb
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kelbim is a tool to manage ELB.