aws_config 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d2a27d4fa0613f456f1b3da9fa72c8ea6bc9e7
-  data.tar.gz: 5e755930909eae2434eda5290724278d4e6a82bb
+  metadata.gz: 88a82fbb7b9a68a42fdcc7f1cc9139ddd5d4b8bd
+  data.tar.gz: 6d0a314b119d49b0f52fd72b6660130daa63ad32
 SHA512:
-  metadata.gz: 0ad003aa7df45d64bfd53c66a7df78aeaa8332596290432b30b28280ff215f63bc9dfa1a731b685dabd61661798d3aba277ce2b0aededcd66d96e18ee2d29cfc
-  data.tar.gz: 17824affad770dbe373da8528a7648b947278dea200224cff19b1b1fd2a2864f783d05556f3d0e74a8b1dae8c4ccd49f9f3536f71a3231d7f8d113227d8a3585
+  metadata.gz: 823e225fc21dfe091ac67fd1cd2f3c0dd807fa464768e5d27b31cca99aac1219b828dd34592960a99f17216c60daaf9d0e0e433caef0f22da348b8f9181efced
+  data.tar.gz: b64deea1c8c374456d36e826776a3e737d45f04fd7d7b7a48dff26860d98ad373af3e75cf8651866cbd8a94b12445a9a6ee29f192b7de090054309d8768e95c4

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor

data/lib/aws_config/parser.rb

@@ -6,70 +6,58 @@ module AWSConfig
     attr_accessor :credential_file_mode
 
     def self.parse(string, credential_file_mode = false)
-      parser = new
-      parser.credential_file_mode = credential_file_mode
-      parser.parse(string)
+      from_hash(new.tokenize(string))
     end
 
-    def parse(string)
-      wrap(build(tokenize(string)))
-    end
-
-    private
-
-      def tokenize(string)
-        s = StringScanner.new(string)
-        tokens  = []
-
-        until s.eos?
-          if s.scan(/\[\s*([^\]]+)\s*\]/)
-            if s[1] == "default"
-              tokens << [:profile, "default"]
-            elsif m = s[1].match(/profile\s+([^\s]+)$/)
-              tokens << [:profile, m[1]]
-            elsif credential_file_mode
-              tokens << [:profile, s[1]]
-            end
-          elsif s.scan(/([^\s=#]+)\s*=\s*([^\s#]+)/)
-            tokens << [:key_value, s[1], s[2]]
-          elsif s.scan(/#[^\n]*/)
-          elsif s.scan(/\s+/)
-          elsif s.scan(/\n+/)
-          else
-            s.scan(/./)
-            raise "Invalid token `#{s[0]}` as #{s.pos}"
-          end
+    def self.from_hash(hash)
+      hash.inject({}) do |memo, (k,v)|
+        if v.is_a?(Hash)
+          memo[k]=Profile.new(k,v)
+        else
+          memo[k] = v
         end
 
-        tokens
+        memo
       end
+    end
 
-      def build(tokens)
-        tokens = tokens.dup
-        profiles = {}
-        profile = nil
-
-        while values = tokens.shift
-          head = values.shift
+    def tokenize(string)
+      tokens = { }
+      current_profile = nil
+      current_nesting = nil
+
+      string.lines.each do |line|
+        comment = line.match(/^\s*#.*/)
+        blank = line.match(/^\s*$/)
+        next if comment || blank
+
+        profile_match = line.match(/\[\s*(profile)?\s*(?<profile>[^\]]+)\s*\]/)
+        if profile_match
+          current_profile = profile_match[:profile]
+          tokens[current_profile] ||= {}
+          next
+        end
 
-          case head
-          when :profile
-            profile = profiles[values[0]] ||= {}
-          when :key_value
-            if profile
-              profile[values[0]] = values[1]
-            end
+        nest_key_value = line.match(/(?<nest>^\s+)?(?<key>[^\s=#]+)\s*=\s*(?<value>[^\s#]+)/)
+        if nest_key_value
+          nest, key, value = !!nest_key_value[:nest], nest_key_value[:key], nest_key_value[:value]
+          if nest
+            fail("Nesting without a parent error") if current_nesting.nil?
+            tokens[current_profile][current_nesting][key] = value
+          else
+            current_nesting = nil
+            tokens[current_profile][key] = value
           end
+          next
         end
 
-        profiles
-      end
-
-      def wrap(profiles)
-        profiles.inject({}) do |s, (name, properties)|
-          s[name] = Profile.new(name, properties)
-          s
+        nesting = line.match(/(?<name>[^\s=#]+)\s*=.*/)
+        if nesting
+          current_nesting = nesting[:name]
+          tokens[current_profile][current_nesting] ||= {}
         end
       end
+      tokens
+    end
   end
 end

data/lib/aws_config/profile.rb

@@ -58,15 +58,8 @@ module AWSConfig
       }
     end
 
-    # Returns a new profile from the two merged profiles
-    def merge(profile)
-      merged = entries.dup
-      merged.merge! profile.entries
-      new name, merged
-    end
-
-    def merge!(profile)
-      entries.merge! profile.entries
+    def merge!(other)
+      @entries = Parser.from_hash(entries.merge(other.entries))
       self
     end
   end

data/lib/aws_config/version.rb

@@ -1,3 +1,3 @@
 module AWSConfig
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/spec/lib/aws_config/parser_spec.rb

@@ -11,12 +11,93 @@ aws_access_key_id=DefaultAccessKey01
 aws_secret_access_key=Default/Secret/Access/Key/02
 region=us-west-1
       EOC
-      it { should eq [
-        [:profile,    "default"],
-        [:key_value,  "aws_access_key_id",      "DefaultAccessKey01"],
-        [:key_value,  "aws_secret_access_key",  "Default/Secret/Access/Key/02"],
-        [:key_value,  "region",                 "us-west-1"]
-      ] }
+      it { should eq(
+        "default" => {
+          "aws_access_key_id" => "DefaultAccessKey01",
+          "aws_secret_access_key" => "Default/Secret/Access/Key/02",
+          "region" => "us-west-1" }
+      ) }
+    end
+
+    context "with nesting" do
+      let(:string) { <<-EOC }
+[default]
+region=us-east-1
+s3=
+  max_concurrent_requests=100101
+  max_queue_size=20
+output=json
+      EOC
+      it { should eq(
+        "default" => {
+          "region" => "us-east-1",
+          "s3" => {
+            "max_concurrent_requests" => "100101",
+            "max_queue_size" => "20"
+          },
+          "output" => "json" }
+      ) }
+    end
+
+    context "invalid nesting" do
+      let(:string) { <<-EOC }
+[default]
+region=us-east-1
+s3=
+  max_concurrent_requests=100101
+output=json
+  max_queue_size=20
+      EOC
+      it "raises an exception" do
+        expect { subject }.to raise_error(RuntimeError, "Nesting without a parent error")
+      end
+    end
+
+    context "multiple nesting" do
+      let(:string) { <<-EOC }
+[default]
+region=us-east-1
+s3=
+  max_concurrent_requests=100101
+  max_queue_size=20
+output=json
+api_versions =
+    ec2 = 2015-03-01
+    cloudfront = 2015-09-17
+      EOC
+      it { should eq(
+        "default" => {
+          "region" => "us-east-1",
+          "s3" => {
+            "max_concurrent_requests" => "100101",
+            "max_queue_size" => "20"
+          },
+          "output" => "json",
+          "api_versions" => {
+            "ec2" => "2015-03-01",
+            "cloudfront" => "2015-09-17"
+          }
+        }
+      ) }
+    end
+
+    context "with comments" do
+      let(:string) { <<-EOC }
+[default] # inline comment in a profile
+region=us-east-1 # inline comment in top level element
+s3= # inline comment in nesting openning
+  max_concurrent_requests=100101 # inline comment in a nested element
+  # comment prefixed with spaces
+# comment in a new line
+      EOC
+      it { should eq(
+        "default" => {
+          "region" => "us-east-1",
+          "s3" => {
+            "max_concurrent_requests" => "100101",
+          }
+        }
+      ) }
     end
 
     context "default and named profiles" do
@@ -27,12 +108,10 @@ aws_access_key_id=DefaultAccessKey01
 [profile testing]
 aws_access_key_id=TestingAccessKey03
       EOC
-      it { should eq [
-        [:profile,    "default"],
-        [:key_value,  "aws_access_key_id",  "DefaultAccessKey01"],
-        [:profile,    "testing"],
-        [:key_value,  "aws_access_key_id",  "TestingAccessKey03"],
-      ] }
+      it { should eq(
+        "default" => { "aws_access_key_id" => "DefaultAccessKey01" },
+        "testing" => { "aws_access_key_id" => "TestingAccessKey03" }
+      ) }
 
       context "Comment line" do
         let(:string) { <<-EOC }
@@ -40,10 +119,9 @@ aws_access_key_id=TestingAccessKey03
 # THIS IS COMMENT #
 aws_access_key_id=DefaultAccessKey01
         EOC
-        it { should eq [
-          [:profile,    "default"],
-          [:key_value,  "aws_access_key_id",  "DefaultAccessKey01"]
-        ] }
+        it { should eq(
+          "default" => { "aws_access_key_id" => "DefaultAccessKey01" }
+        ) }
       end
 
       context "Blank line" do
@@ -53,10 +131,9 @@ aws_access_key_id=DefaultAccessKey01
 
 aws_access_key_id=DefaultAccessKey01
         EOC
-        it { should eq [
-          [:profile,    "default"],
-          [:key_value,  "aws_access_key_id",  "DefaultAccessKey01"]
-        ] }
+        it { should eq(
+          "default" => { "aws_access_key_id" => "DefaultAccessKey01" }
+        ) }
       end
     end
 
@@ -67,108 +144,31 @@ aws_access_key_id=DefaultAccessKey01
         sut.send(:tokenize, string)
       end
       context "with only the default profile" do
-        let(:string) do
-          <<-EOC
-            [default]
-            aws_access_key_id=DefaultAccessKey01
-            aws_secret_access_key=Default/Secret/Access/Key/02
-          EOC
-        end
-        it { should eq [
-          [:profile,    "default"],
-          [:key_value,  "aws_access_key_id",      "DefaultAccessKey01"],
-          [:key_value,  "aws_secret_access_key",  "Default/Secret/Access/Key/02"],
-        ] }
+        let(:string) { <<-EOC }
+[default]
+aws_access_key_id=DefaultAccessKey01
+aws_secret_access_key=Default/Secret/Access/Key/02
+        EOC
+        it { should eq(
+          "default" => {
+            "aws_access_key_id" => "DefaultAccessKey01",
+            "aws_secret_access_key" => "Default/Secret/Access/Key/02"
+          }
+        ) }
       end
 
       context "with the default and named profiles" do
-        let(:string) do
-          <<-EOC
-            [default]
-            aws_access_key_id=DefaultAccessKey01
-
-            [testing]
-            aws_access_key_id=TestingAccessKey03
-          EOC
-        end
-        it { should eq [
-          [:profile,    "default"],
-          [:key_value,  "aws_access_key_id",  "DefaultAccessKey01"],
-          [:profile,    "testing"],
-          [:key_value,  "aws_access_key_id",  "TestingAccessKey03"],
-        ] }
-      end
-    end
-  end
-
-  describe "#build" do
-    subject { described_class.new.send(:build, tokens) }
-
-    context "Single profile" do
-      let(:tokens) { [
-        [:profile,    "default"],
-        [:key_value,  "aws_access_key_id",      "DefaultAccessKey01"],
-        [:key_value,  "aws_secret_access_key",  "Default/Secret/Access/Key/02"],
-        [:key_value,  "region",                 "us-west-1"]
-      ] }
-      it { should eq({
-        "default" => {
-          "aws_access_key_id"     => "DefaultAccessKey01",
-          "aws_secret_access_key" => "Default/Secret/Access/Key/02",
-          "region"                => "us-west-1"
-        }
-      }) }
-    end
-
-    context "Multi profiles" do
-      let(:tokens) { [
-        [:profile,    "default"],
-        [:key_value,  "aws_access_key_id",  "DefaultAccessKey01"],
-        [:profile,    "testing"],
-        [:key_value,  "aws_access_key_id",  "TestingAccessKey02"],
-      ] }
-      it { should eq({
-        "default" => { "aws_access_key_id" => "DefaultAccessKey01" },
-        "testing" => { "aws_access_key_id" => "TestingAccessKey02" }
-      }) }
-    end
-
-    context "Twice-defined single profile" do
-      let(:tokens) { [
-        [:profile,    "default"],
-        [:key_value,  "aws_access_key_id",      "DefaultAccessKey01"],
-        [:key_value,  "region",                 "us-west-1"],
-        [:profile,    "default"],
-        [:key_value,  "aws_access_key_id",      "DefaultAccessKey01_ANOTHER"],
-        [:key_value,  "aws_secret_access_key",  "Default/Secret/Access/Key/01"],
-      ] }
-      it { should eq({
-        "default" => {
-          "aws_access_key_id"     => "DefaultAccessKey01_ANOTHER",
-          "aws_secret_access_key" => "Default/Secret/Access/Key/01",
-          "region"                => "us-west-1"
-        }
-      }) }
-    end
-  end
-
-  describe "#wrap" do
-    subject { described_class.new.send(:wrap, profiles) }
+        let(:string) { <<-EOC }
+[default]
+aws_access_key_id=DefaultAccessKey01
 
-    context "Single profile" do
-      let(:profiles) {
-        {
-          "default" => {
-            "aws_access_key_id"     => "DefaultAccessKey01",
-            "aws_secret_access_key" => "Default/Secret/Access/Key/02",
-            "region"                => "us-west-1"
-          }
-        }
-      }
-      it { should be_a Hash }
-      it { should have_key "default" }
-      it "should have AWSConfig::Profile as value" do
-        expect(subject["default"]).to be_a AWSConfig::Profile
+[testing]
+aws_access_key_id=TestingAccessKey03
+        EOC
+        it { should eq(
+          "default" => { "aws_access_key_id" => "DefaultAccessKey01" },
+          "testing" => { "aws_access_key_id" => "TestingAccessKey03" }
+        ) }
       end
     end
   end

data/spec/lib/aws_config_spec.rb

@@ -11,10 +11,17 @@ describe AWSConfig do
   it "should return an entry in a profile via method" do
     expect(described_class.default.aws_access_key_id).to eq "DefaultAccessKey01"
     expect(described_class.default.region).to eq "us-west-1"
+    expect(described_class.default.output).to eq "json"
+    expect(described_class.default.s3.max_concurrent_requests).to eq "100101"
+    expect(described_class.default.s3.max_queue_size).to eq "20"
   end
 
   it "should return an entry in a profile like hashes" do
     expect(described_class["default"]["aws_access_key_id"]).to eq "DefaultAccessKey01"
     expect(described_class["default"]["region"]).to eq "us-west-1"
+    expect(described_class["default"]["output"]).to eq "json"
+    expect(described_class["default"]["s3"]["max_concurrent_requests"]).
+      to eq "100101"
+    expect(described_class["default"]["s3"]["max_queue_size"]).to eq "20"
   end
 end

data/spec/samples/config.txt

@@ -2,7 +2,13 @@
 # Optional, to define default region for this profile.
 region=us-west-1
 source_profile=default
+# Nested
+s3=
+  max_concurrent_requests=100101
+  max_queue_size=20
+output=json
 
 [profile testing]
 region=us-west-2
 source_profile=testing
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_config
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Masato Ikeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: AWSConfig is a parser for AWS_CONFIG_FILE used in aws-cli.