piculet 0.0.2 → 0.1.0

data/bin/piculet

@@ -47,7 +47,7 @@ ARGV.options do |opt|
       exit 1
     end
   rescue => e
-    $stderr.puts e
+    $stderr.puts("[ERROR] #{e.message}")
     exit 1
   end
 end
@@ -64,7 +64,7 @@ end
 begin
   logger = Piculet::Logger.instance
   logger.set_debug(options[:debug])
-   client = Piculet::Client.new(options)
+  client = Piculet::Client.new(options)
 
   case mode
   when :export
@@ -122,7 +122,7 @@ rescue => e
   if options[:debug]
     raise e
   else
-    $stderr.puts e
+    $stderr.puts("[ERROR] #{e.message}".red)
     exit 1
   end
 end

data/lib/piculet/dsl/security-group.rb

@@ -32,15 +32,26 @@ module Piculet
         end
 
         def ingress(&block)
+          if @ingress_is_defined
+            raise "SecurityGroup `#{@name}`: `ingress` is already defined"
+          end
+
           @result.ingress = Permissions.new(@name, :ingress, &block).result
+          @ingress_is_defined = true
         end
 
         def egress(&block)
+          if @egress_is_defined
+            raise "SecurityGroup `#{@name}`: `egress` is already defined"
+          end
+
           unless @vpc
             raise "SecurityGroup `#{@name}`: Cannot define `egress` in classic"
           end
 
           @result.egress = Permissions.new(@name, :egress, &block).result
+
+          @egress_is_defined = true
         end
       end # SecurityGroup
     end # EC2

data/lib/piculet/version.rb

@@ -1,5 +1,5 @@
 module Piculet
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end
 
 Version = Piculet::VERSION

data/lib/piculet/wrapper/permission-collection.rb

@@ -96,10 +96,14 @@ module Piculet
               when Array
                 owner_id, group = src
 
-                unless group =~ /\Asg-[0-9a-f]\Z/
+                unless group =~ /\Asg-[0-9a-f]+\Z/
                   sg_coll = @options.ec2.security_groups.filter('group-name', group)
-                  sg_coll = sg_coll.filter('vpc-id', @security_group.vpc_id) if @security_group.vpc?
-                  sg_coll = sg_coll.filter('owner-id', owner_id) unless @options.ec2.own?(owner_id)
+
+                  if @options.ec2.own?(owner_id)
+                    sg_coll = sg_coll.filter('vpc-id', @security_group.vpc_id) if @security_group.vpc?
+                  else
+                    sg_coll = sg_coll.filter('owner-id', owner_id)
+                  end
 
                   unless (sg = sg_coll.first)
                     raise "Can't find SecurityGroup: #{owner_id}/#{group} in #{@security_group.vpc_id || :classic}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 535241775
+      hash: 998644499
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 535241775
+      hash: 998644499
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23