docker_rack 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea65c176d2cfb82e154297fe668c4473c2c9af26
-  data.tar.gz: cf8c6de8e2163233ff8a7d41d8460f993ee9e482
+  metadata.gz: 8f5cc5e09334e35027c40055aa1d1382fd758d69
+  data.tar.gz: 82ece69939e1e74f359809f86440af5b2db14659
 SHA512:
-  metadata.gz: fec22a282babc91291bec9be6f2042cef5500fc3ed6565a9c8b3ab937505fd4de5debfb96420aa9363a0ee21b3f1792bace6b015657471554154985d656a0a6d
-  data.tar.gz: 3aa4405e349873862a16d8a8e7e3feef743a7d4e6c91ca13e5d7b73f8c9025933052dcd5925bf1aeb7dbd0e2d33c6262ac074bd95e141722ba82447352824285
+  metadata.gz: 384018106a1cfdb4275f823808623524c9de6988ec3ebc3bb7e3a8181b58c8aea23d460a2ee399cc6774d249e726c4cc58d896a7bd50b952ea3a3951809ab550
+  data.tar.gz: 24484e7449dd7f195f8bb6034df8bedb967ef5d60e4fe2b093ca6c4a7bf209ae5573ffd2b97baab41509cb4646d485d88d0edc82dcfe835485310951bb2be0f9

data/.rubocop.yml

@@ -5,6 +5,6 @@ inherit_from: .rubocop_todo.yml
 Metrics/AbcSize:
   Max: 22
 Metrics/MethodLength:
-  Max: 20
+  Max: 30
 Metrics/ClassLength:
   Max: 190

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-02-07 13:41:07 -0500 using RuboCop version 0.37.0.
+# on 2016-02-07 18:30:47 -0500 using RuboCop version 0.37.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -33,15 +33,11 @@ Lint/UselessAssignment:
     - 'lib/docker_rack/container_template.rb'
     - 'lib/docker_rack/dev_environment.rb'
 
-# Offense count: 3
-Metrics/AbcSize:
-  Max: 59
-
 # Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 18
+  Max: 15
 
-# Offense count: 24
+# Offense count: 23
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -50,11 +46,11 @@ Metrics/LineLength:
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 35
+  Max: 30
 
 # Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 17
+  Max: 15
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -69,12 +65,6 @@ Style/ColonMethodCall:
   Exclude:
     - 'lib/docker_rack/docker_utils.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/CommentIndentation:
-  Exclude:
-    - 'lib/docker_rack/docker_utils.rb'
-
 # Offense count: 6
 Style/Documentation:
   Exclude:
@@ -87,12 +77,6 @@ Style/Documentation:
     - 'lib/docker_rack/docker_utils.rb'
     - 'lib/docker_rack/task_mngr1.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLines:
-  Exclude:
-    - 'lib/docker_rack/container_template.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -148,12 +132,6 @@ Style/InfiniteLoop:
   Exclude:
     - 'lib/docker_rack/docker_utils.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Exclude:
-    - 'lib/docker_rack/dev_environment.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/MethodCallParentheses:
@@ -196,7 +174,7 @@ Style/RedundantParentheses:
   Exclude:
     - 'lib/docker_rack/cli/base.rb'
 
-# Offense count: 6
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
@@ -213,25 +191,6 @@ Style/RegexpLiteral:
   Exclude:
     - 'lib/docker_rack/docker_utils.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceAfterComma:
-  Exclude:
-    - 'lib/docker_rack/docker_utils.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceAfterNot:
-  Exclude:
-    - 'lib/docker_rack/docker_utils.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'lib/docker_rack/container_template.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
@@ -239,12 +198,6 @@ Style/SpaceAroundOperators:
 Style/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/SpaceInsideBrackets:
-  Exclude:
-    - 'container_templates/scripts/settings.rake'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForEmptyBraces, SupportedStyles.
@@ -259,18 +212,9 @@ Style/SpaceInsideHashLiteralBraces:
 Style/SpecialGlobalVars:
   Enabled: false
 
-# Offense count: 8
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: final_newline, final_blank_line
-Style/TrailingBlankLines:
-  Exclude:
-    - 'bin/docker_rack'
-    - 'lib/docker_rack/cli/base.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker_rack (0.0.4)
+    docker_rack (0.0.5)
       rake (~> 0)
       thor (~> 0.18, >= 0.18.0)
 

data/bin/docker_rack

@@ -2,4 +2,4 @@
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'docker_rack'
-DockerRack::CLI::Base.start
+DockerRack::CLI::Base.start

data/lib/docker_rack/cli/base.rb

@@ -50,4 +50,4 @@ module DockerRack
       end
     end
   end
-end
+end

data/lib/docker_rack/container_template.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/AbcSize
+
 require 'rake'
 require 'rake/tasklib'
 require 'pathname'
@@ -68,7 +70,6 @@ module Container
         tasks.any? { |task| task.name == task_name }
       end
 
-
       def invoke(name)
         Rake.application[name].invoke
       end
@@ -102,27 +103,27 @@ module Container
         args || args = []
 
         # desc "Starting #{template_name}"
-        task (name + ":start").to_sym do
+        task (name + ':start').to_sym do
           puts "Starting: #{path}"
           Docker::Utils.start_container load_container_template(path)
         end
 
         # # desc "Stopping #{template_name}"
-        task (name + ":stop").to_sym do
+        task (name + ':stop').to_sym do
           puts "Stopping: #{path}"
           container_template = load_template_file(path)
           Docker::Utils.stop_container container_template
         end
 
         # # desc "Restarting #{template_name}"
-        task (name + ":restart").to_sym do
+        task (name + ':restart').to_sym do
           puts "Restarting: #{path}"
-          Rake::Task[name + ":stop"].invoke
-          Rake::Task[name + ":start"].invoke
+          Rake::Task[name + ':stop'].invoke
+          Rake::Task[name + ':start'].invoke
         end
 
         desc "Tasks help for #{template_name}"
-        task (name + ":help").to_sym do
+        task (name + ':help').to_sym do
           puts "Tasks for: #{path}"
           puts "rake #{name}:start\t\t# Starting #{template_name}"
           puts "rake #{name}:stop\t\t# Stopping #{template_name}"
@@ -140,7 +141,7 @@ module Container
 
         container_template = YAML.load_file(file_path)
         if Pathname.new(file_path).basename.to_s.include? '.erb'
-          template           = ERB.new(container_template.to_yaml).result(OpenStruct.new(vars).instance_eval { binding })
+          template = ERB.new(container_template.to_yaml).result(OpenStruct.new(vars).instance_eval { binding })
           puts template if LOG_LEVEL == 'DEBUG'
           container_template = YAML.load(template)
         end

data/lib/docker_rack/dev_environment.rb

@@ -50,9 +50,9 @@ module Environment
       # http.set_debug_output($stdout)
       header = {'Content-Type' => 'text/json'}
       request = Net::HTTP::Put.new(uri.request_uri, initheader = header)
-      #request.add_field('Content-Type', 'application/json')
-      #request.add_field('Content-Type', 'text/plain; charset=utf-8')
-      request.body = payload #.to_json
+      # request.add_field('Content-Type', 'application/json')
+      # request.add_field('Content-Type', 'text/plain; charset=utf-8')
+      request.body = payload # .to_json
       response = http.request(request)
       result = response.body
     else

data/lib/docker_rack/docker_utils.rb

@@ -1,10 +1,12 @@
+# rubocop:disable Metrics/AbcSize
+
 module Docker
   class Utils
 
     def self.dockerhost
       @dockerhost = ENV['DOCKER_HOST']
       return nil if @dockerhost.nil?
-      @dockerhost[/tcp:\/\/([^:]+)/,1]
+      @dockerhost[/tcp:\/\/([^:]+)/, 1]
     end
 
     def self.create_docker_command(info)
@@ -80,23 +82,18 @@ module Docker
       Array(info['checks']).each do |check|
         try = (check['retry'] || 3).to_i
         interval = (check['interval'] || 2).to_i
+        check['ip'] ||= dockerhost
+        detect_check(check)
         while true
           sleep interval
           put_char '.' if LOG_LEVEL != 'DEBUG'
           case check['type']
             when 'port'
-              puts "Checking port #{check['ip']}:#{check['port']} availability." if LOG_LEVEL == 'DEBUG'
-              result = is_port_open?(check['ip'], check['port'])
-              puts "Result: #{result}" if LOG_LEVEL == 'DEBUG'
-              break if result
+              break if check_port(check)
             when 'rest'
-              puts "Checking HTTP response #{check['uri']}." if LOG_LEVEL == 'DEBUG'
-              result = is_http_present?(check['uri'])
-              puts "Result: #{result}" if LOG_LEVEL == 'DEBUG'
-              break if result
+              break if check_rest(check)
             when 'script'
-              `#{check['script']}`
-              break if $?.to_i == 0
+              break if check_script(check)
             else
               puts 'Unrecognizable check type. Skipping ...'
           end
@@ -107,6 +104,34 @@ module Docker
       end
     end
 
+    def self.detect_check(check)
+      return if check.key?('type')
+      if check.key?('port')
+        check['type'] = 'port'
+      elsif check.key?('uri')
+        check['type'] = 'rest'
+      end
+    end
+
+    def self.check_port(check)
+      puts "Checking port #{check['ip']}:#{check['port']} availability." if LOG_LEVEL == 'DEBUG'
+      result = is_port_open?(check['ip'], check['port'])
+      puts "Result: #{result}" if LOG_LEVEL == 'DEBUG'
+      return result
+    end
+
+    def self.check_rest(check)
+      puts "Checking HTTP response #{check['uri']}." if LOG_LEVEL == 'DEBUG'
+      result = is_http_present?(check['uri'])
+      puts "Result: #{result}" if LOG_LEVEL == 'DEBUG'
+      return result
+    end
+
+    def self.check_script(check)
+      `#{check['script']}`
+      return $?.to_i == 0
+    end
+
     def self.put_char(str)
       print str
       $stdout.flush
@@ -144,7 +169,7 @@ module Docker
     end
 
     def self.present?(name)
-      ! containers_by_name(name).empty?
+      !containers_by_name(name).empty?
     end
 
     def self.containers_by_name(name)

data/lib/docker_rack/version.rb

@@ -1,3 +1,3 @@
 module DockerRack
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_rack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Igor Moochnick