tagenv 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a31dcee93ac08da65bdd769c8b2b37a96e0a0af7
-  data.tar.gz: 7b9976b148e7db5fb537419d0e776b801cabc728
+  metadata.gz: 6e34cf2452e553e4cb4051340cd0905790f50a0d
+  data.tar.gz: edabe84a5d3e4f70d5ac8481ed98a6c3cc1dca22
 SHA512:
-  metadata.gz: c3f37bc7ad0c8d540f6e033f835d8f112c00a723d969a70d53d8c6505ec9b7756c18cfd82f3ccbd6c81f678122fd78f6f278c1588ddf93732f2f88fcede39070
-  data.tar.gz: 45c212287c86b39afdee0c298027a1f770815741ffb84b2a7b665ef347a00781d5704a93d0905c957cff8538b313e74d0cf6dbad50165951edb90d030cd32258
+  metadata.gz: '020955db6d7dc98511877fb57980051a8cb22ec480208274b2fb4e54af072af90d51c39360ede242f4d10836638e9bf45fdbbb2bf55ca5aed18754beaae24821'
+  data.tar.gz: 44f0bb292908fcaadfea556b5d2e6884c9830180a0705fd070fb4499983d4bbfed1c9dea22d46cec1505928124ac6648b0ada21aac5e23dd0ea2d28231f76dee

data/.travis.yml

@@ -1,18 +1,15 @@
 language: ruby
 
 rvm:
-  - 2.0.*
   - 2.1.*
   - 2.2.*
-  - 2.3.0
+  - 2.3.3
+  - 2.4.0
 
 gemfile:
   - Gemfile
 
 os:
   - linux
-  - osx
-
-before_install: gem update bundler
 
 script: 'bundle exec rake spec'

data/README.md

@@ -2,34 +2,63 @@
 
 ec2 instance tag apply environment variables.
 
-## Examples
+## Settings
 
+```sh
+export AWS_ACCESS_KEY_ID=XXXXXXXXXXXXXXXXXXXX
+export AWS_SECRET_ACCESS_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+export AWS_REGION=ap-northeast-1
 ```
+
+* support environment variables and iam role.
+
+## Examples
+
+```ruby
 require 'tagenv'
 
-Tagenv::Env.load(prefix: 'EC2TAG_')
+Tagenv.load(prefix: 'EC2TAG_')
 
 p ENV
-# {"EC2TAG_Group"=>"group_a", "EC2TAG_Roles"=>"front", "EC2TAG_Stages"=>"staging", "EC2TAG_Name"=>"feweb07", "EC2TAG_Project"=>"project_a"}
+# {
+#   "EC2TAG_Group"=>"group_a",
+#   "EC2TAG_Roles"=>"front",
+#   "EC2TAG_Stages"=>"staging",
+#   "EC2TAG_Name"=>"app01",
+#   "EC2TAG_Project"=>"project_a"
+#   ....
+# }
 ```
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'tagenv'
+```sh
+gem 'tagenv'
+```
 
 And then execute:
 
-    $ bundle
+```sh
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install tagenv
+```sh
+$ gem install tagenv
+```
 
 ## Synopsis
 
-    $ tagenv
+```sh
+$ tagenv
+```
+
+## Future
+
+* Support provider GCP.
 
 ## Contributing
 
@@ -45,9 +74,3 @@ Or install it yourself as:
 * [Issues](https://github.com/toyama0919/tagenv/issues)
 * [Documentation](http://rubydoc.info/gems/tagenv/frames)
 * [Email](mailto:toyama0919@gmail.com)
-
-## Copyright
-
-Copyright (c) 2017 toyama0919
-
-See [LICENSE.txt](../LICENSE.txt) for details.

data/lib/tagenv/cli.rb

@@ -17,7 +17,7 @@ module Tagenv
     option :provider, type: :string, default: 'ec2', desc: 'provider'
     option :print, aliases: '-P', type: :boolean, desc: 'print'
     def load
-      Tagenv::Env.load(
+      Tagenv.load(
         prefix: options[:prefix],
         instance_id: options[:instance_id],
         provider: options[:provider]

data/lib/tagenv/constants.rb

@@ -1,3 +1,2 @@
 module Tagenv
-  TIME_OUT = 3
 end

data/lib/tagenv/ec2/metadata.rb

@@ -1,10 +1,13 @@
 require 'logger'
 require 'open-uri'
 require 'json'
+require "timeout"
 
 module Tagenv
   module Ec2
     class Metadata
+      TIME_OUT = 3
+
       def self.get_metadata(path)
         begin
           result = {}
@@ -13,7 +16,7 @@ module Tagenv
             return body
           }
           return result
-        rescue Timeout::Error => e
+        rescue ::Timeout::Error => e
           raise "not EC2 instance"
         end
       end

data/lib/tagenv/ec2/tag.rb

@@ -1,4 +1,5 @@
 require 'aws-sdk'
+require_relative 'tag_util'
 
 module Tagenv
   module Ec2
@@ -20,15 +21,7 @@ module Tagenv
         tags = @ec2.describe_instances(
           instance_ids: [instance_id]
         ).data.to_h[:reservations].map { |instance| instance[:instances].first }.first[:tags]
-        convert_tag_hash(tags)
-      end
-
-      def convert_tag_hash(tags)
-        result = {}
-        tags.each {|hash|
-          result[hash['key'] || hash[:key]] = hash['value'] || hash[:value]
-        }
-        result
+        TagUtil.convert_tag_hash(tags)
       end
     end
   end

data/lib/tagenv/ec2/tag_util.rb

@@ -0,0 +1,15 @@
+require 'aws-sdk'
+
+module Tagenv
+  module Ec2
+    class TagUtil
+      def self.convert_tag_hash(tags)
+        result = {}
+        tags.each {|hash|
+          result[hash['key'] || hash[:key]] = hash['value'] || hash[:value]
+        }
+        result
+      end
+    end
+  end
+end

data/lib/tagenv/version.rb

@@ -1,4 +1,4 @@
 module Tagenv
   # tagenv version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/tagenv.rb

@@ -1,6 +1,20 @@
 require 'tagenv/version'
 require 'tagenv/constants'
-require 'tagenv/env'
 require 'tagenv/ec2/metadata'
 require 'tagenv/ec2/tag'
 require 'tagenv/cli'
+
+module Tagenv
+  def self.load(prefix: '', instance_id: nil, provider: 'ec2')
+    tag_hash = {}
+    if provider == 'ec2'
+      @ec2_tag = Ec2::Tag.new
+      tag_hash = @ec2_tag.get_tag_hash(instance_id)
+    else
+      raise "Unsupport provider [#{provider}]"
+    end
+    tag_hash.each do |k, v|
+      ENV[prefix + k] = v
+    end
+  end
+end

data/spec/cli_spec.rb

@@ -5,7 +5,7 @@ describe Tagenv::CLI do
   before do
   end
 
-  it "should stdout sample" do
+  it "should stdout help" do
     output = capture_stdout do
       Tagenv::CLI.start(['help'])
     end
@@ -14,9 +14,11 @@ describe Tagenv::CLI do
 
   it "include" do
     output = capture_stdout do
-      Tagenv::CLI.start(['help', 'sample'])
+      Tagenv::CLI.start(['help', 'load'])
     end
-    expect(output).to include('--fields')
+    expect(output).to include('--provider')
+    expect(output).to include('--instance-id')
+    expect(output).to include('--prefix')
   end
 
   after do

data/spec/ec2/tag_util_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'tagenv'
+
+describe Tagenv::Ec2::Tag do
+  before do
+  end
+
+  it "convert_tag_hash_1" do
+    aws_tag_format = [
+      { key: 'Name', value: 'app01' },
+      { key: 'Stages', value: 'production' }
+    ]
+    expect_value = { 'Name' => 'app01', 'Stages' => 'production' }
+    expect(Ec2::TagUtil.convert_tag_hash(aws_tag_format)).to(eq(expect_value))
+  end
+
+  it "convert_tag_hash_2" do
+    aws_tag_format = [
+      { 'key' => 'Name', 'value' => 'app01' },
+      { 'key' => 'Stages', 'value' => 'production' }
+    ]
+    expect_value = { 'Name' => 'app01', 'Stages' => 'production' }
+    expect(Ec2::TagUtil.convert_tag_hash(aws_tag_format)).to(eq(expect_value))
+  end
+
+  after do
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagenv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - toyama0919
@@ -150,7 +150,6 @@ files:
 - ".yardopts"
 - ChangeLog.md
 - Gemfile
-- LICENSE.txt
 - README.md
 - Rakefile
 - bin/tagenv
@@ -159,10 +158,10 @@ files:
 - lib/tagenv/constants.rb
 - lib/tagenv/ec2/metadata.rb
 - lib/tagenv/ec2/tag.rb
-- lib/tagenv/env.rb
+- lib/tagenv/ec2/tag_util.rb
 - lib/tagenv/version.rb
 - spec/cli_spec.rb
-- spec/core_spec.rb
+- spec/ec2/tag_util_spec.rb
 - spec/spec_helper.rb
 - spec/tagenv_spec.rb
 - tagenv.gemspec
@@ -192,6 +191,6 @@ specification_version: 4
 summary: ec2 instance tag apply environment variables.
 test_files:
 - spec/cli_spec.rb
-- spec/core_spec.rb
+- spec/ec2/tag_util_spec.rb
 - spec/spec_helper.rb
 - spec/tagenv_spec.rb

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2017 toyama0919
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/tagenv/env.rb

@@ -1,16 +0,0 @@
-module Tagenv
-  class Env
-    def self.load(prefix: '', instance_id: nil, provider: 'ec2')
-      tag_hash = {}
-      if provider == 'ec2'
-        @ec2_tag = Ec2::Tag.new
-        tag_hash = @ec2_tag.get_tag_hash(instance_id)
-      else
-        raise "Unsupport provider [#{provider}]"
-      end
-      tag_hash.each do |k, v|
-        ENV[prefix + k] = v
-      end
-    end
-  end
-end

data/spec/core_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-require 'tagenv'
-
-describe Tagenv::Core do
-  before do
-    @core = Core.new
-  end
-
-  it "core not nil" do
-    expect(@core).not_to eq(nil)
-  end
-
-  it "private method" do
-    @core.send(:sample, []).should == []
-  end
-
-  after do
-  end
-end