kumogata 0.4.19 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a626076a8776de3b3f80ff1627fa21753236f73c
-  data.tar.gz: 2b532df5a2e844ceb3ea69d791fb1d2fcc30fc5b
+  metadata.gz: 421af9c3a404389c7a1bba39c9431421967f355c
+  data.tar.gz: b05d0704cf79f758e8cd870605ac4cf37b43cf57
 SHA512:
-  metadata.gz: cfbc840b9761ff339e536a6e4e43c8a27866c910454ffb8f0783ff2ec446d3a691025dd9db4ae9c16d2f85f1310e6b864a74442cbb7f00bf0356833a9902b163
-  data.tar.gz: 71cc9feed08e69b16523136b607f5c7f2184ac7a8f5855dd0d3d9a53e59bcfd7c3dcebe55f47f30f351124624f5385788a4f86a4f317f6fb9796e46ba077db1d
+  metadata.gz: d481e6b9ed516bfbd8f0593b8a7f10eff3fe7d11a902ae6d4a4d09e6f6f31b0afbaab3c061ae0324c1fb10724b9d25f4d3eedbe23791981befbc0d3619ed04b4
+  data.tar.gz: e2c3c0b2f7d6e1010a423f1c579a283a32f050caf8a89370d1c424fa3c3423aea6b5515acd0910299d57aa40790a36f518009d0519df09a4b3c1ca0c71b99055

data/bin/kumogata

@@ -3,7 +3,6 @@ $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'rubygems'
 require 'kumogata'
 require 'kumogata/argument_parser'
-require 'kumogata/config_parser'
 
 options = nil
 
@@ -22,38 +21,13 @@ begin
   Diffy::Diff.default_format = options.color? ? :color : :text
 
   aws_opts = {}
-  config_parser = Kumogata::ConfigParser.new
 
-  # Set config file path
-  if options.config_path?
-    unless File.exist?(options.config_path)
-      raise "No such config file: #{options.config_path}"
-    end
-
-    config_parser.path = options.config_path
-  end
-
-  # Load .aws/config
-  # See http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html
-  if config_parser.path.exist?
-    config_parser.parse!
+  if options.config_profile
+    provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(
+      :profile_name => profile_name
+    )
 
-    if options.config_profile and not config_parser[options.config_profile]
-      raise "No profile: #{config_parser.path} => #{options.config_profile}"
-    end
-
-    profile_name = options.config_profile || :default
-
-    if (profile = config_parser[profile_name])
-      {
-        'aws_access_key_id'     => :access_key_id,
-        'aws_secret_access_key' => :secret_access_key,
-        'region'                => :region,
-      }.each do |config_key, option_key|
-        option_value = profile[config_key]
-        aws_opts[option_key] = option_value if option_value
-      end
-    end
+    aws_opts[:credential_provider] = provider
   end
 
   [:access_key_id, :secret_access_key, :region].each do |key|

data/kumogata.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'aws-sdk', '>= 1.48.0', '< 2.0.0'
   spec.add_dependency 'coderay'
   spec.add_dependency 'coffee-script'
   spec.add_dependency 'diffy'

data/lib/kumogata/client.rb

@@ -187,7 +187,8 @@ class Kumogata::Client
 
         Kumogata::Utils.stringify(obj.to_hash)
       when :json5
-        JSON5.parse(f.read)
+        parsed = JSON5.parse(f.read)
+        Kumogata::Utils.stringify(parsed)
       else
         raise "Unknown format: #{format}"
       end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.19'
+  VERSION = '0.5.0'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'kumogata'
 require 'kumogata/argument_parser'
-require 'kumogata/config_parser'
 require 'tempfile'
 require 'time'
 require 'timecop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.5.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.48.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.48.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +288,6 @@ files:
 - lib/kumogata.rb
 - lib/kumogata/argument_parser.rb
 - lib/kumogata/client.rb
-- lib/kumogata/config_parser.rb
 - lib/kumogata/crypt.rb
 - lib/kumogata/ext/coderay_ext.rb
 - lib/kumogata/ext/json_ext.rb
@@ -300,7 +305,6 @@ files:
 - spec/Drupal_Single_Instance.template
 - spec/Drupal_Single_Instance.template.rb
 - spec/Drupal_Single_Instance.template.yml
-- spec/kumogata_config_parser_spec.rb
 - spec/kumogata_convert_spec.rb
 - spec/kumogata_create_spec.rb
 - spec/kumogata_crypt_spec.rb
@@ -337,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A tool for AWS CloudFormation.
@@ -345,7 +349,6 @@ test_files:
 - spec/Drupal_Single_Instance.template
 - spec/Drupal_Single_Instance.template.rb
 - spec/Drupal_Single_Instance.template.yml
-- spec/kumogata_config_parser_spec.rb
 - spec/kumogata_convert_spec.rb
 - spec/kumogata_create_spec.rb
 - spec/kumogata_crypt_spec.rb

data/lib/kumogata/config_parser.rb

@@ -1,33 +0,0 @@
-class Kumogata::ConfigParser
-  attr_reader :path
-
-  def initialize(path = '~/.aws/config')
-    self.path = path
-    @profiles = {}
-  end
-
-  def path=(v)
-    @path = Pathname.new(v).expand_path
-  end
-
-  def [](profile_name)
-    @profiles[profile_name.to_s]
-  end
-
-  def parse!
-    profile_name = nil
-
-    @path.each_line do |line|
-      line.strip!
-      next if line.empty?
-
-      if line =~ /\A\[(.+)\]\z/
-        profile_name = $1
-      elsif profile_name
-        key, value = line.split('=', 2).map {|i| i.strip }
-        @profiles[profile_name] ||= {}
-        @profiles[profile_name][key] = value
-      end
-    end
-  end
-end

data/spec/kumogata_config_parser_spec.rb

@@ -1,38 +0,0 @@
-describe Kumogata::ConfigParser do
-  subject { Kumogata::ConfigParser.new }
-
-  it 'parse aws/config' do
-    content = <<-EOS
-[default]
-aws_access_key_id = AKIAIOSFODNN7EXAMPLE
-aws_secret_access_key = wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
-aws_security_token = texample123324
-
-[profile2]
-aws_access_key_id = xAKIAIOSFODNN7EXAMPLE
-aws_secret_access_key = xwJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
-aws_security_token = xtexample123324
-
-[invalid]
-    EOS
-
-    tempfile(content) do |config|
-      subject.path = config.path
-      subject.parse!
-
-      expect(subject[:default]).to eq(
-        'aws_access_key_id' => 'AKIAIOSFODNN7EXAMPLE',
-        'aws_secret_access_key' => 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
-        'aws_security_token' => 'texample123324',
-      )
-
-      expect(subject['profile2']).to eq(
-        'aws_access_key_id' => 'xAKIAIOSFODNN7EXAMPLE',
-        'aws_secret_access_key' => 'xwJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
-        'aws_security_token' => 'xtexample123324',
-      )
-
-      expect(subject['invalid']).to be_nil
-    end
-  end
-end