piculet 0.2.7 → 0.2.8.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0080fb8e4ab9d61753f34f40504fbaf8b41a84e9
-  data.tar.gz: 784434d98d3bd33c7929f37d7f8054aa680dbfb7
+  metadata.gz: 964c624907487d13b2db743957f28a4d6e20e94c
+  data.tar.gz: 744750153bd12e4cda705d5c8b66042a17246d05
 SHA512:
-  metadata.gz: 6bdca234290efe4f9e4d83d2052328569d4ecf4f6943bcdb2074f4d4260f8db161abe7e69926fe634a4a21bde049c001523fc4dcfa7642d8a7539d9f823cf27c
-  data.tar.gz: 0104cacd35a090d04bbd0fd9b8a9699683b42c7140d9440dd89b3289006c00ea750172d22962e61d756d252274ba6a652d7bedb3e235b3acbf295cda71e161e1
+  metadata.gz: d2a3df7fed7c6ca29e38f197ed03e2de54b00f305bdb76b014b0b42ff1cdc4f257e4209f8c33d5fda0347383774bb92eb1a8d97159f2d530880fe93568de2947
+  data.tar.gz: 651d72e1ed2e96c8a04288b1494748c6f006369891993cf2f3d6cd40b5fa4da3a7e64b88abc5ce18aecb3f047b04bff531823cd29742a4af4d2f5702783d82c4

data/README.md

@@ -53,6 +53,7 @@ Usage: piculet [options]
     -e, --export
     -o, --output FILE
         --split
+        --format=FORMAT
         --no-color
         --debug
 ```
@@ -168,5 +169,78 @@ ec2 "vpc-XXXXXXXX" do
 end
 ```
 
+## JSON Groupfile
+
+```json
+{
+  "vpc-12345678": {
+    "sg-12345678": {
+      "name": "default",
+      "description": "default VPC security group",
+      "tags": {
+        "key": "val"
+      },
+      "owner_id": "123456789012",
+      "ingress": [
+        {
+          "protocol": "any",
+          "port_range": null,
+          "ip_ranges": [
+
+          ],
+          "groups": [
+            {
+              "id": "sg-12345678",
+              "name": "default",
+              "owner_id": "123456789012"
+            }
+          ]
+        },
+        {
+          "protocol": "tcp",
+          "port_range": "22..22",
+          "ip_ranges": [
+            "0.0.0.0/0"
+          ],
+          "groups": [
+
+          ]
+        },
+        {
+          "protocol": "tcp",
+          "port_range": "80..80",
+          "ip_ranges": [
+            "0.0.0.0/0"
+          ],
+          "groups": [
+
+          ]
+        }
+      ],
+      "egress": [
+        {
+          "protocol": "any",
+          "port_range": null,
+          "ip_ranges": [
+            "0.0.0.0/0"
+          ],
+          "groups": [
+
+          ]
+        }
+      ]
+    }
+  }
+}
+```
+
+### Export
+
+    $ piculet --export --format=json -o Groupfile.json
+
+### Apply
+
+    $ piculet --apply --format=json -f Groupfile.json
+
 ## Similar tools
 * [Codenize.tools](http://codenize.tools/)

data/bin/piculet

@@ -17,6 +17,7 @@ EOS
 
 options = {
   :dry_run     => false,
+  :format      => :json,
   :color       => true,
   :debug       => false,
 }
@@ -29,22 +30,23 @@ ARGV.options do |opt|
     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')                  {|v| mode                         = :apply  }
-    opt.on('-f', '--file FILE')              {|v| file                         = v       }
-    opt.on('-n', '--names SG_LIST', Array)   {|v| options[:sg_names]           = v       }
-    opt.on('-x', '--exclude SG_LIST', Array) {|v| options[:exclude_sgs]        = v       }
-    opt.on('',   '--ec2s VPC_IDS', Array)    {|v| options[:ec2s]               = v       }
-    opt.on('',   '--dry-run')                {|v| options[:dry_run]            = true    }
-    opt.on('-e', '--export')                 {|v| mode                         = :export }
-    opt.on('-o', '--output FILE')            {|v| output_file                  = v       }
-    opt.on('',   '--split')                  {|v| split                        = true    }
-    opt.on(''  , '--no-color')               {    options[:color]              = false   }
-    opt.on(''  , '--debug')                  {    options[:debug]              = true    }
+    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')                         {|v| mode                         = :apply  }
+    opt.on('-f', '--file FILE')                     {|v| file                         = v       }
+    opt.on('-n', '--names SG_LIST', Array)          {|v| options[:sg_names]           = v       }
+    opt.on('-x', '--exclude SG_LIST', Array)        {|v| options[:exclude_sgs]        = v       }
+    opt.on('',   '--ec2s VPC_IDS', Array)           {|v| options[:ec2s]               = v       }
+    opt.on('',   '--dry-run')                       {|v| options[:dry_run]            = true    }
+    opt.on('-e', '--export')                        {|v| mode                         = :export }
+    opt.on('-o', '--output FILE')                   {|v| output_file                  = v       }
+    opt.on('',   '--split')                         {|v| split                        = true    }
+    opt.on('',   '--format=FORMAT', [:ruby, :json]) {|v| options[:format]             = v       }
+    opt.on(''  , '--no-color')                      {    options[:color]              = false   }
+    opt.on(''  , '--debug')                         {    options[:debug]              = true    }
     opt.parse!
 
     aws_opts = {}
@@ -102,39 +104,56 @@ begin
       output_file = 'Groupfile' if output_file == '-'
       requires = []
 
-      client.export(options) do |exported, converter|
+      client.export(options.merge(:without_convert => options[:format] != :ruby)) do |exported, converter|
         exported.each do |vpc, security_groups|
           group_file = File.join(File.dirname(output_file), "#{vpc || :classic}.group")
+
+          if options[:format] == :json
+            group_file << '.json'
+          end
+
           requires << group_file
 
           logger.info("  write `#{group_file}`")
 
           open(group_file, 'wb') do |f|
-            f.puts MAGIC_COMMENT
-            f.puts converter.call(vpc => security_groups)
+            if options[:format] == :json
+              f.puts  JSON.pretty_generate(vpc => security_groups)
+            else
+              f.puts MAGIC_COMMENT
+              f.puts converter.call(vpc => security_groups)
+            end
           end
         end
       end
 
-      logger.info("  write `#{output_file}`")
+      if options[:format] == :ruby
+        logger.info("  write `#{output_file}`")
 
-      open(output_file, 'wb') do |f|
-        f.puts MAGIC_COMMENT
+        open(output_file, 'wb') do |f|
+          f.puts MAGIC_COMMENT
 
-        requires.each do |group_file|
-          f.puts "require '#{File.basename group_file}'"
+          requires.each do |group_file|
+            f.puts "require '#{File.basename group_file}'"
+          end
         end
       end
     else
+      exported = client.export(options.merge(:without_convert => options[:format] != :ruby))
+
+      if options[:format] == :json
+        exported = JSON.pretty_generate(exported)
+      end
+
       if output_file == '-'
-        logger.info('# Export SecurityGroup')
-        puts client.export(options)
+        logger.info('# Export SecurityGroup') if options[:format] == :ruby
+        puts exported
       else
         logger.info("Export SecurityGroup to `#{output_file}`")
 
         open(output_file, 'wb') do |f|
-          f.puts MAGIC_COMMENT
-          f.puts client.export(options)
+          f.puts MAGIC_COMMENT if options[:format] == :ruby
+          f.puts exported
         end
       end
     end

data/lib/piculet/client.rb

@@ -18,14 +18,18 @@ module Piculet
         Exporter.export(@options.ec2, @options_hash.merge(options))
       end
 
-      if block_given?
-        converter = proc do |src|
+      converter = proc do |src|
+        if options[:without_convert]
+          exported
+        else
           DSL.convert(src, @options.ec2.owner_id)
         end
+      end
 
+      if block_given?
         yield(exported, converter)
       else
-        DSL.convert(exported, @options.ec2.owner_id)
+        converter.call(exported)
       end
     end
 
@@ -33,15 +37,33 @@ module Piculet
     def load_file(file)
       if file.kind_of?(String)
         open(file) do |f|
-          DSL.define(f.read, file).result
+          load_by_format(f.read, file)
         end
       elsif file.respond_to?(:read)
-        DSL.define(file.read, file.path).result
+        load_by_format(file.read, file.path)
       else
         raise TypeError, "can't convert #{file} into File"
       end
     end
 
+    def load_by_format(src, path)
+      if @options.format == :json
+        src = load_json(src, path)
+      end
+
+      DSL.define(src, path).result
+    end
+
+    def load_json(json, path)
+      json = JSON.parse(json, :symbolize_names => true)
+
+      if json.has_key?(:'')
+        json[nil] = json.delete(:'')
+      end
+
+      DSL.convert(json, @options.ec2.owner_id)
+    end
+
     def walk(file)
       dsl = load_file(file)
 

data/lib/piculet/dsl/converter.rb

@@ -20,7 +20,7 @@ module Piculet
 
       private
       def output_ec2(vpc, security_groups)
-        vpc = vpc ? vpc.inspect + ' ' : ''
+        vpc = vpc ? vpc.to_s.inspect + ' ' : ''
         security_groups = security_groups.map {|sg_id, sg|
           output_security_group(sg_id, sg)
         }.join("\n").strip
@@ -76,8 +76,9 @@ end
       end
 
       def output_perm(permission)
-        protocol = permission[:protocol]
+        protocol = permission[:protocol].to_sym
         port_range = permission[:port_range]
+        port_range = eval(port_range) if port_range.kind_of?(String)
         args = [protocol, port_range].select {|i| i }.map {|i| i.inspect }.join(', ') + ' '
 
         ip_ranges = permission.fetch(:ip_ranges, [])

data/lib/piculet/version.rb

@@ -1,3 +1,3 @@
 module Piculet
-  VERSION = "0.2.7"
+  VERSION = "0.2.8.beta"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8.beta
 platform: ruby
 authors:
 - winebarrel
@@ -146,9 +146,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14