holepunch 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835de8629ab48100eb2c3d3dd5e0ecb36b2df16a
-  data.tar.gz: b237f089c115c345dccb9fd76cd27c6cdc1b0608
+  metadata.gz: 8a08441876887342e6570fd07d22796ca946409b
+  data.tar.gz: 2be013a42dbca64d9ee952082bb855846950292c
 SHA512:
-  metadata.gz: f46ed832177b63432c5c977be97fe14430f1b5f5bee5e795b8167de6f95397bd3ae45f044ddfa18066e016b19903b925c79161f351ddbf5bf160ef06fb848926
-  data.tar.gz: 537fb43dc6c40dc3b733ed5b8213031d4c9791c2e74c3897902d992aba074eead37c0a2d23a6b7b08d650ba52c63ec87c42196a9ef55cc5e5edad1f6be84828d
+  metadata.gz: f072b9211e176a12c861cf3e163e8d171392927a3238849108e8a906154a5a373f2dadd823abc34718fc2512229bdc7cecb22dc77d8dd82c0833b023be3c3557
+  data.tar.gz: 309dd74b73a0ad8ee8cf89c55c6b3d0c6e1a458dd9e1a72d84e634462ff4f5854f690a52080822d9684cfd52d04acbafd33360f7bb1cd7295cfd09129cd7ddfb

data/lib/holepunch.rb

@@ -46,7 +46,7 @@ module HolePunch
     # @option opts [String] :aws_secret_access_key  the AWS secret access key
     # @option opts [String] :aws_region             the AWS region
     def apply(filename, env, opts = {})
-      definition = Definition.build(filename, env)
+      definition = DSL.evaluate(filename, env)
       ec2 = EC2.new(opts)
       ec2.apply(definition)
     end
@@ -58,7 +58,7 @@ module HolePunch
     # @param env      [String, nil]   the environment
     # @param groups   [Array<String>] the list of security groups to check
     def defined?(filename, env, groups)
-      definition = Definition.build(filename, env)
+      definition = DSL.evaluate(filename, env)
       groups.all? do |group_id|
         definition.groups.include?(group_id)
       end
@@ -71,7 +71,7 @@ module HolePunch
     # @param env      [String, nil]   the environment
     # @param groups   [Array<String>] the list of security groups to check
     def select_undefined(filename, env, groups)
-      definition = Definition.build(filename, env)
+      definition = DSL.evaluate(filename, env)
       groups.reject do |group_id|
         definition.groups.include?(group_id)
       end
@@ -86,7 +86,7 @@ module HolePunch
     #
     # @return [Array<String>] the list of security group names
     def service_groups(filename, env, name)
-      definition = Definition.build(filename, env)
+      definition = DSL.evaluate(filename, env)
       service = definition.services[name]
       raise ServiceDoesNotExistError, "service '#{name}' not found" if service.nil?
       service.groups

data/lib/holepunch/cli.rb

@@ -30,17 +30,19 @@ module HolePunch
 
     default_task :apply
 
-    option :'aws-access-key',         aliases: :A, type: :string, default: ENV['AWS_ACCESS_KEY_ID'], desc:
+    option :'aws-access-key',         aliases: :A,    type: :string, default: ENV['AWS_ACCESS_KEY_ID'], desc:
       'Your AWS Access Key ID'
-    option :'aws-secret-access-key',  aliases: :k, type: :string, default: ENV['AWS_SECRET_ACCESS_KEY'], desc:
+    option :'aws-secret-access-key',  aliases: :k,    type: :string, default: ENV['AWS_SECRET_ACCESS_KEY'], desc:
       'Your AWS API Secret Access Key'
-    option :'aws-region',             aliases: :r, type: :string, default: ENV['AWS_REGION'], desc:
+    option :'aws-region',             aliases: :r,    type: :string, default: ENV['AWS_REGION'], desc:
       'Your AWS region'
-    option :env,                      aliases: :e, type: :string, desc:
+    option :'aws-vpc-id',             aliases: :c,    type: :string, desc:
+      'Set the VPC ID (for VPC security groups)'
+    option :env,                      aliases: :e,    type: :string, desc:
       'Set the environment'
-    option :file,                     aliases: :f, type: :string, default: "#{Dir.pwd}/SecurityGroups", desc:
+    option :file,                     aliases: :f,    type: :string, default: "#{Dir.pwd}/SecurityGroups", desc:
       'The location of the SecurityGroups file to use'
-    option :verbose,                  aliases: :v, type: :boolean, desc:
+    option :verbose,                  aliases: :v,    type: :boolean, desc:
       'Enable verbose output'
     desc 'apply [OPTIONS]', 'apply the defined security groups to ec2'
     def apply
@@ -53,6 +55,7 @@ module HolePunch
         aws_access_key_id:     options[:'aws-access-key'],
         aws_secret_access_key: options[:'aws-secret-access-key'],
         aws_region:            options[:'aws-region'],
+        aws_vpc_id:            options[:'aws-vpc-id'],
       })
     rescue EnvNotDefinedError => e
       Logger.fatal('You have security groups that use an environment, but you did not specify one. See --help')
@@ -72,7 +75,7 @@ module HolePunch
     def service(name = nil)
       Logger.verbose = options[:verbose]
 
-      definition = Definition.build(options[:file], options[:env])
+      definition = DSL.evaluate(options[:file], options[:env])
 
       if options[:list]
         definition.services.keys.sort.each do |name|

data/lib/holepunch/definition.rb

@@ -70,18 +70,7 @@ module HolePunch
     attr_reader :groups
     attr_reader :services
 
-    class << self
-      def build(file, env)
-        filename = Pathname.new(file).expand_path
-        unless filename.file?
-          raise SecurityGroupsFileNotFoundError, "#{filename} not found"
-        end
-
-        DSL.evaluate(file, env)
-      end
-    end
-
-    def initialize(env = nil)
+    def initialize(env)
       @env = env
       @groups = {}
       @services = {}

data/lib/holepunch/dsl.rb

@@ -71,7 +71,7 @@ module HolePunch
 
     def icmp(*sources)
       sources << '0.0.0.0/0' if sources.empty?
-      @model.ingresses << Permission.new(:icmp, nil, sources.flatten)
+      @model.ingresses << Permission.new(:icmp, 0, sources.flatten)
     end
     alias_method :ping, :icmp
 
@@ -88,6 +88,11 @@ module HolePunch
 
   class DSL < BaseDSL
     def self.evaluate(filename, env)
+      path = Pathname.new(filename).expand_path
+      unless path.file?
+        raise SecurityGroupsFileNotFoundError, "#{filename} not found"
+      end
+
       DSL.new(env).eval_dsl(filename)
     end
 

data/lib/holepunch/ec2.rb

@@ -40,6 +40,7 @@ module HolePunch
 
       @ec2    = AWS::EC2.new
       @region = @ec2.regions[opts[:aws_region]]
+      @vpc_id = opts[:aws_vpc_id]
     end
 
     def apply(definition)
@@ -59,7 +60,7 @@ module HolePunch
         ec2_group = find(id)
         if ec2_group.nil?
           Logger.log(:create, id)
-          ec2_group = create(id, group.desc)
+          ec2_group = create(id, group.desc, @vpc_id)
         end
         ec2_groups[id] = ec2_group
       end
@@ -82,7 +83,7 @@ module HolePunch
             end
           end
           unless revoke_sources.empty?
-            Logger.log("revoke #{ec2_perm.protocol}", "#{id} #{sources_list_to_s(revoke_sources)}")
+            Logger.log("revoke #{ec2_perm.protocol}", "#{id} #{sources_list_to_s(revoke_sources)} #{ec2_perm.port_range}")
             ec2_group.revoke_ingress(ec2_perm.protocol, ec2_perm.port_range, *revoke_sources)
           end
         end
@@ -106,7 +107,7 @@ module HolePunch
             end
           end
           unless new_sources.empty?
-            Logger.log(perm.type, "#{id} #{sources_list_to_s(new_sources)}")
+            Logger.log(perm.type, "#{id} #{sources_list_to_s(new_sources)} #{perm.ports}")
             ec2_group.authorize_ingress(perm.type, perm.ports, *new_sources)
           end
         end
@@ -116,11 +117,13 @@ module HolePunch
 
     private
       def fetch!
-        @groups = @region.security_groups.to_a
+        @groups = @region.security_groups.to_a.keep_if do |region|
+          !@vpc_id == !region.vpc_id
+        end
       end
 
-      def create(name, description)
-        group = @region.security_groups.create(name, description: description)
+      def create(name, description, vpc)
+        group = @region.security_groups.create(name, description: description, vpc: vpc)
         @groups << group
         group
       end

data/lib/holepunch/version.rb

@@ -19,5 +19,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module HolePunch
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holepunch
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ben Scott
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor