holepunch 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee112b10944d69873e6fcf50a0b1536a5adfb88c
-  data.tar.gz: f40ac7918db97e6fd64470b40358fe344d456380
+  metadata.gz: 835de8629ab48100eb2c3d3dd5e0ecb36b2df16a
+  data.tar.gz: b237f089c115c345dccb9fd76cd27c6cdc1b0608
 SHA512:
-  metadata.gz: 4330a09b9e4e9fc291c3910395bb160bf97a94ba52404113eb6cee6386fe9a9ceadbfd60296c8f5e2efd83f389ae80978d1ec764afee411bc919447e3ae93764
-  data.tar.gz: 828ad00eb16a838923cd72be646348ac4745bee98bdadd19d4faf7c07d5a5322db96edba8cfd06881b40755c7346ca81b41bd458b5dc7718264b56fb24ba2cab
+  metadata.gz: f46ed832177b63432c5c977be97fe14430f1b5f5bee5e795b8167de6f95397bd3ae45f044ddfa18066e016b19903b925c79161f351ddbf5bf160ef06fb848926
+  data.tar.gz: 537fb43dc6c40dc3b733ed5b8213031d4c9791c2e74c3897902d992aba074eead37c0a2d23a6b7b08d650ba52c63ec87c42196a9ef55cc5e5edad1f6be84828d

data/lib/holepunch.rb

@@ -36,6 +36,47 @@ module HolePunch
   class ServiceDoesNotExistError < HolePunchError; end
 
   class << self
+    # Applies the given SecurityGroups file to EC2.
+    #
+    # @param filename [String]      the path to the SecurityGroups file
+    # @param env      [String, nil] the environment
+    # @param opts     [Hash]        additional options
+    #
+    # @option opts [String] :aws_access_key_id      the AWS access key id
+    # @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)
+      ec2 = EC2.new(opts)
+      ec2.apply(definition)
+    end
+
+    # Tests if a list of security groups are all defined in the SecurityGroups
+    # file.
+    #
+    # @param filename [String]        the path to the SecurityGroups file
+    # @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)
+      groups.all? do |group_id|
+        definition.groups.include?(group_id)
+      end
+    end
+
+    # Checks a list of security groups against the SecurityGroups file and
+    # returns an array of the groups that are undefined.
+    #
+    # @param filename [String]        the path to the SecurityGroups file
+    # @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)
+      groups.reject do |group_id|
+        definition.groups.include?(group_id)
+      end
+    end
+
     # Examines the given SecurityGroups file for the given service and returns
     # a list of the security groups that make up that service.
     #
@@ -55,10 +96,12 @@ module HolePunch
     # private helpers
     #
 
+    # @private
     def cidr?(value)
       value.to_s =~ /\d+\.\d+\.\d+\.\d+\/\d+/
     end
 
+    # @private
     def read_file(file)
       content = File.open(file, 'rb') do |io|
         io.read

data/lib/holepunch/cli.rb

@@ -49,14 +49,11 @@ module HolePunch
       Logger.fatal("AWS Region not defined. Use --aws-region or AWS_REGION") if options[:'aws-region'].nil?
       Logger.verbose = options[:verbose]
 
-      definition = Definition.build(options[:file], options[:env])
-      ec2 = EC2.new({
-        access_key_id:     options[:'aws-access-key'],
-        secret_access_key: options[:'aws-secret-access-key'],
-        region:            options[:'aws-region'],
+      HolePunch.apply(options[:file], options[:env], {
+        aws_access_key_id:     options[:'aws-access-key'],
+        aws_secret_access_key: options[:'aws-secret-access-key'],
+        aws_region:            options[:'aws-region'],
       })
-      ec2.apply(definition)
-
     rescue EnvNotDefinedError => e
       Logger.fatal('You have security groups that use an environment, but you did not specify one. See --help')
     rescue HolePunchError => e

data/lib/holepunch/ec2.rb

@@ -27,24 +27,22 @@ module HolePunch
 
     def initialize(opts = {})
       opts = {
-        access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
-        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
-        region:            ENV['AWS_REGION'],
+        aws_access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
+        aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        aws_region:            ENV['AWS_REGION'],
       }.merge(opts)
 
-      AWS.config(opts)
+      AWS.config({
+        access_key_id:     opts[:aws_access_key_id],
+        secret_access_key: opts[:aws_secret_access_key],
+        region:            opts[:aws_region],
+      })
 
       @ec2    = AWS::EC2.new
-      @region = @ec2.regions[opts[:region]]
+      @region = @ec2.regions[opts[:aws_region]]
     end
 
     def apply(definition)
-      if definition.env.nil?
-        Logger.log("Creating security groups in '#{@region.name}' region")
-      else
-        Logger.log("Creating security groups for '#{definition.env}' environment in '#{@region.name}' region")
-      end
-
       # get the security group data from the AWS servers
       fetch!
 

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.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holepunch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben Scott
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -163,6 +163,7 @@ description: |
   group 'my-service' do
     ping '10.0.0.0/16'
   end
+  ```
 
   It can be useful to describe groups of security groups you plan to launch
   instances with by using the `service` declaration.