docker_rails_proxy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86e87f736cdb77f074bc5f4ddc13d7b0dd1cac5
-  data.tar.gz: 446a32d260cd722d2ab161066692acf66b2e07d8
+  metadata.gz: 2d0a319496777448c5a39f6f26198f968431caa7
+  data.tar.gz: 0a676fa8a764a8990aaa4c2465c589061c02f809
 SHA512:
-  metadata.gz: a5185b8c4321d571b494348f20d02f9aaea523facf74129f40c75a11f6c903b8887d553dca93a1fe18f640dd3df75dfddbb0b62f9d7cb64ba1b464d20055797d
-  data.tar.gz: 7cec30b6afb0e58324cf698d7aa865ac330676441534bc570726f7ed0b0d3316b3bddbc669d519c41b43ea0a39d46b268ad477efa991a34429c2a537a32be7e8
+  metadata.gz: e927e9b628e8c76446d751726f031cb0cb14ca4cce3366d81af0e32f204e6cc58b922d5fa1be975c4fa3b51cda76edd9346b7594c353acfd4716ff1da30e0992
+  data.tar.gz: fb0b69285552f3c0549584877c9c752d96dab24e0728d8a90f681bc33c253302f269ba650b0a414b34a1badb54650f186ac42ff0d8d13f388c987843b0cd4bc3

data/README.md

@@ -1 +1,17 @@
-# docker_rails_proxy
+### To release a new version
+
+Update `lib/docker_rails_proxy/version.rb` with the new version and commit that change.
+
+**Git Tag**
+```bash
+git tag v0.0.1
+git push origin v0.0.1
+```
+
+**Gem Build**
+
+The user on rubygems.org is eureaktechteam@gmail.com.  Credentials are in 1password "Eureka Tech" vault 
+```bash
+gem build docker_rails_proxy.gemspec
+gem push docker_rails_proxy-0.0.1.gem
+```

data/lib/docker_rails_proxy/commands/compose/up.rb

@@ -68,6 +68,7 @@ module DockerRailsProxy
       end
 
       def fswatch_start
+        puts 'fswatch has been started'
         PTY.spawn(FSWATCH_CMD) do |stdout, stdin, pid|
           begin
             stdout.each { |path| sync_or_kill(path: path, pid: pid) }
@@ -75,8 +76,13 @@ module DockerRailsProxy
             $stderr.puts EIO_ERROR
           end
         end
+
       rescue PTY::ChildExited
         $stderr.puts '"The fswatch process exited!'
+
+      # Captures Ctrl-C
+      rescue Exception
+        puts 'fswatch has been stopped'
       end
 
       def sync_or_kill(path:, pid:)

data/lib/docker_rails_proxy/commands/stack/create.rb

@@ -24,7 +24,7 @@ module DockerRailsProxy
       validates do
         if YML_EXTENSIONS.include? File.extname(options[:ymlfile])
           self.data          = YAML::load_file(options[:ymlfile])
-          options[:jsonfile] = options[:ymlfile].sub(/\..+/, '.json')
+          options[:jsonfile] = options[:ymlfile].sub(/\/(\w+)\..+$/, '/.\1.json')
           File.write(options[:jsonfile], data.to_json)
         else
           "#{options[:ymlfile]} is not a yml file"
@@ -122,7 +122,30 @@ module DockerRailsProxy
               ).strip.split(' ')
 
               print_options(key_pairs, "Choose an option for #{key} and press [ENTER]")
-              parameters[key] = get_option(key_pairs, value)
+              parameters[key] = get_option(key_pairs)
+
+            when 'List<AWS::EC2::Subnet::Id>'
+              subnets_data ||= JSON.load %x(
+                aws ec2 describe-subnets --profile '#{options[:profile]}'
+              ).strip
+
+              subnets = {}
+
+              subnets_data['Subnets'].map{|h|
+                subnets[h['SubnetId']] = "#{h['SubnetId']} (#{h['CidrBlock']})"
+              }
+
+              # By VPCs
+              subnets_data['Subnets']
+                .group_by{|h| h['VpcId'] }
+                .map{|vpc_id, subnets_attrs|
+                  vpc = [vpc_id, subnets_attrs.first['DefaultForAz'] ? '(Default)' : nil].compact.join(' ')
+                  subnet_ids = subnets_attrs.map{|h| h['SubnetId']}.join(',')
+                  subnets[subnet_ids] = "#{vpc}: [#{subnet_ids}]"
+                }
+
+              print_options(subnets.values, "Choose an option for #{key} and press [ENTER] (Use 0,1,2... to select multiple values)")
+              parameters[key] = get_option(subnets.keys, array: true)
 
             else
               value ||= attrs['Default']
@@ -137,14 +160,14 @@ module DockerRailsProxy
                 parameters[key] = value if parameters[key].blank?
               else
                 print_options(allowed_values, "Choose an option for #{key} and press [ENTER] (Default: #{value})")
-                parameters[key] = get_option(allowed_values, value)
+                parameters[key] = get_option(allowed_values, default: value)
               end
             end
           end
         end
 
         self.parameters = parameters.map do |key, value|
-          "ParameterKey=\"#{key}\",ParameterValue=\"#{value}\",UsePreviousValue=false"
+          %{'ParameterKey="#{key}",ParameterValue="#{value}",UsePreviousValue=false'}
         end
       end
 

data/lib/docker_rails_proxy/version.rb

@@ -1,3 +1,3 @@
 module DockerRailsProxy
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/docker_rails_proxy.rb

@@ -3,6 +3,8 @@ Dir[File.expand_path('../docker_rails_proxy/extends/*.rb', __FILE__)].map do |f|
 end
 
 module DockerRailsProxy
+  NUMBER_REGEXP = /^\d+$/.freeze
+
   COMMANDS = Dir[File.expand_path('../docker_rails_proxy/commands/*.rb', __FILE__)].map do |f|
     File.basename(f, '.rb').parameterize
   end.freeze
@@ -79,13 +81,21 @@ module DockerRailsProxy
       values.each_with_index { |v, i| puts "#{i}) #{v}" }
     end
 
-    def get_option(values, default = nil)
+    def get_option(values, default: nil, array: false)
       flush_stdin
       print ": "
       option = $stdin.gets.chomp
 
       return default if option.blank?
-      option =~ /^\d+$/ ? values[option.to_i] : nil
+
+      if array
+        options = option.split(',')
+        return nil unless options.map{|o| o =~ NUMBER_REGEXP }.all?
+
+        options.map{|o| values[o.to_i].split(',') }.flatten.compact.uniq.join(',')
+      else
+        values[option.to_i] if option =~ NUMBER_REGEXP
+      end
     end
 
     def flush_stdin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_rails_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jairo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email: