docker_rack 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5cc5e09334e35027c40055aa1d1382fd758d69
-  data.tar.gz: 82ece69939e1e74f359809f86440af5b2db14659
+  metadata.gz: 9aedc0085f11b56cb2f360414cfcbe24dd37b745
+  data.tar.gz: 4a207c2a8aaac2dc8886bee3fa65bc9836a51fc2
 SHA512:
-  metadata.gz: 384018106a1cfdb4275f823808623524c9de6988ec3ebc3bb7e3a8181b58c8aea23d460a2ee399cc6774d249e726c4cc58d896a7bd50b952ea3a3951809ab550
-  data.tar.gz: 24484e7449dd7f195f8bb6034df8bedb967ef5d60e4fe2b093ca6c4a7bf209ae5573ffd2b97baab41509cb4646d485d88d0edc82dcfe835485310951bb2be0f9
+  metadata.gz: 572c8d621e1836d9f7be30222bc262ae219842e92d19b2ea0a18f67c5342dca41efa16e79aafab779442551f52cc547e4f5c0842662ec27acece3a8cb9e01ee7
+  data.tar.gz: d6ecdada512abf538a764c48af821e3f0ff64c48f9293ebfd4a9f71c933eb5c8213f01d92254188c78f570346a090b2342b2879c550ec06967feced21c201cb5

data/.rubocop.yml

@@ -1,10 +1,13 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 2.2
+
 #######
 # WIP These should all go back to defaults at some point
 Metrics/AbcSize:
   Max: 22
 Metrics/MethodLength:
-  Max: 30
+  Max: 40
 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 18:30:47 -0500 using RuboCop version 0.37.0.
+# on 2016-02-07 23:58:16 -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
@@ -16,7 +16,7 @@ Lint/LiteralInCondition:
   Exclude:
     - 'lib/docker_rack/docker_utils.rb'
 
-# Offense count: 4
+# Offense count: 2
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
     - 'lib/docker_rack/container_template.rb'
@@ -27,26 +27,20 @@ Lint/StringConversionInInterpolation:
   Exclude:
     - 'lib/docker_rack/docker_utils.rb'
 
-# Offense count: 2
+# Offense count: 1
 Lint/UselessAssignment:
   Exclude:
-    - 'lib/docker_rack/container_template.rb'
     - 'lib/docker_rack/dev_environment.rb'
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
   Max: 15
 
-# Offense count: 23
+# Offense count: 27
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 121
-
-# Offense count: 3
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 30
+  Max: 118
 
 # Offense count: 3
 Metrics/PerceivedComplexity:
@@ -65,7 +59,7 @@ Style/ColonMethodCall:
   Exclude:
     - 'lib/docker_rack/docker_utils.rb'
 
-# Offense count: 6
+# Offense count: 5
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -75,7 +69,6 @@ Style/Documentation:
     - 'lib/docker_rack/container_template.rb'
     - 'lib/docker_rack/dev_environment.rb'
     - 'lib/docker_rack/docker_utils.rb'
-    - 'lib/docker_rack/task_mngr1.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -102,9 +95,17 @@ Style/EmptyLinesAroundModuleBody:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: when_needed, always
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'lib/docker_rack/version.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
   Exclude:
+    - 'container_templates/scripts/settings.rake'
     - 'lib/docker_rack/container_template.rb'
 
 # Offense count: 2
@@ -198,7 +199,7 @@ Style/RegexpLiteral:
 Style/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForEmptyBraces, SupportedStyles.
 # SupportedStyles: space, no_space

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.3

data/Gemfile.lock

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

data/lib/docker_rack/container_template.rb

@@ -1,13 +1,15 @@
-# rubocop:disable Metrics/AbcSize
-
 require 'rake'
 require 'rake/tasklib'
 require 'pathname'
 require 'erb'
 require 'ostruct'
 require 'yaml'
+require 'json/ext'
+require 'net/http'
+
 require_relative 'docker_utils'
 require_relative 'dev_environment'
+require_relative 'utils'
 
 module Container
   module Templates
@@ -39,6 +41,8 @@ module Container
         options.dryrun = false
 
         Rake::TaskManager.record_task_metadata = true
+
+        $environment = environment
       end
 
       def process(params)
@@ -55,13 +59,6 @@ module Container
         end
       end
 
-      def options
-        options = OpenStruct.new
-        options.trace = false
-        options.dryrun = false
-        options
-      end
-
       def tasks
         Rake.application.tasks()
       end
@@ -74,18 +71,21 @@ module Container
         Rake.application[name].invoke
       end
 
+      def environment
+        {
+            dockerhost: Docker::Utils.dockerhost,
+            work_dir: Environment.work_dir
+        }
+      end
+
       private
 
       def load_templates(path, pattern)
-        curr = Pathname.new(Dir.pwd) + path
+        # curr = Pathname.new(Dir.pwd) + path
         # puts "Current: #{curr}"
 
         FileList[File.join(path, pattern)].each do |f|
-          full_path     = File.expand_path(f)
-          template_name = Pathname(strip_extension(full_path)).relative_path_from(curr)
-          # puts "Found #{template_name}: #{friendly_name(template_name.to_s)}"
-
-          load_template ('container:' + friendly_name(template_name.to_s)), full_path, template_name.to_s
+          load_template_from_file File.expand_path(f)
         end
       end
 
@@ -99,53 +99,87 @@ module Container
             .gsub(/\s+/, '_')
       end
 
-      def load_template(name, path, template_name, *args)
-        args || args = []
+      def load_template_from_file(path)
+        load_container_template(path).each do |_, container_template|
+          define_start_task container_template, path
+          define_stop_task container_template, path
+          define_restart_task container_template, path
+          define_help_task container_template, path
+        end
+      end
+
+      def define_start_task(container_template, path)
+        container_name = "container:#{container_template['name']}:start"
+        dependencies = container_template['depends']
 
-        # desc "Starting #{template_name}"
-        task (name + ':start').to_sym do
+        args = []
+        if dependencies.nil?
+          args.insert 0, container_name
+        else
+          args.insert 0, container_name => dependencies.map { |id| "container:#{id}:start" }
+        end
+
+        body = proc do
           puts "Starting: #{path}"
-          Docker::Utils.start_container load_container_template(path)
+          Docker::Utils.start_container container_template
         end
 
-        # # desc "Stopping #{template_name}"
-        task (name + ':stop').to_sym do
+        Rake::Task.define_task(*args, &body)
+      end
+
+      def define_stop_task(container_template, path)
+        container_name = "container:#{container_template['name']}:stop"
+        dependencies = container_template['depends'] || []
+
+        args = []
+        args.insert 0, container_name
+
+        body = proc 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
+        Rake::Task.define_task(*args, &body)
+
+        # Create reverse dependency
+        dependencies.map { |id| "container:#{id}:stop" }.each do |id|
+          task id => container_name
+        end
+      end
+
+      def define_restart_task(container_template, path)
+        container_name = "container:#{container_template['name']}"
+        task (container_name + ':restart').to_sym do
           puts "Restarting: #{path}"
-          Rake::Task[name + ':stop'].invoke
-          Rake::Task[name + ':start'].invoke
+          Rake::Task[container_name + ':stop'].invoke
+          Rake::Task[container_name + ':start'].invoke
         end
+      end
 
-        desc "Tasks help for #{template_name}"
-        task (name + ':help').to_sym do
+      def define_help_task(container_template, path)
+        container_name = "container:#{container_template['name']}"
+        desc "Tasks help for #{container_name}"
+        task (container_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}"
-          puts "rake #{name}:restart\t\t# Restarting #{template_name}"
+          printf("%-40s %-40s\n\r", "#{container_name}:start", "# Starting   #{container_name}")
+          printf("%-40s %-40s\n\r", "#{container_name}:stop", "# Stopping   #{container_name}")
+          printf("%-40s %-40s\n\r", "#{container_name}:restart", "# Restarting #{container_name}")
         end
       end
 
       def load_template_file(file_path)
         puts "Loading #{file_path}" if LOG_LEVEL == 'DEBUG'
 
-        vars = {
-            dockerhost: Docker::Utils.dockerhost,
-            work_dir: Environment.work_dir
-        }
+        vars = environment
 
         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 })
-          puts template if LOG_LEVEL == 'DEBUG'
           container_template = YAML.load(template)
         end
 
+        puts container_template.to_yaml if LOG_LEVEL == 'DEBUG'
+
         return container_template
       end
 
@@ -154,12 +188,10 @@ module Container
 
         container_template.each do |template_id, template|
           template['name'] = template_id
-          if template.key? 'environment'
-            environment                 = template['environment']
-            # TODO: simplify this
-            environment['LOG_LEVEL']    = LOG_LEVEL unless environment.key? 'LOG_LEVEL'
-          end
-          return template
+          next unless template.key? 'environment'
+          environment                 = template['environment']
+          # TODO: simplify this
+          environment['LOG_LEVEL']    = LOG_LEVEL unless environment.key? 'LOG_LEVEL'
         end
       end
     end

data/lib/docker_rack/docker_utils.rb

@@ -41,32 +41,30 @@ module Docker
 
     def self.stop_container(container_template)
 
-      container_template.each do |template_id, _|
-        name = template_id
-        # containers = `docker ps`
-        ps = containers_by_name(name)
-        ps.each do |line|
-          if line != ''
-            cmd = "docker inspect -f {{.State.Running}} #{line}"
+      name = container_template['name']
+      # containers = `docker ps`
+      ps = containers_by_name(name)
+      ps.each do |line|
+        if line != ''
+          cmd = "docker inspect -f {{.State.Running}} #{line}"
+          puts cmd if LOG_LEVEL == 'DEBUG'
+          is_running = `#{cmd}`.strip
+          if is_running == 'true'
+            cmd = "docker kill #{line}"
             puts cmd if LOG_LEVEL == 'DEBUG'
-            is_running = `#{cmd}`.strip
-            if is_running == 'true'
-              cmd = "docker kill #{line}"
-              puts cmd if LOG_LEVEL == 'DEBUG'
-              `#{cmd}`
-            else
-              puts 'Container not running. Nothing to kill. Skipping...'
-            end
+            `#{cmd}`
+          else
+            puts 'Container not running. Nothing to kill. Skipping...'
           end
         end
+      end
 
-        ps = containers_by_name(name)
-        ps.each do |line|
-          if line != ''
-            cmd = "docker rm #{line}"
-            puts cmd if LOG_LEVEL == 'DEBUG'
-            `#{cmd}`
-          end
+      ps = containers_by_name(name)
+      ps.each do |line|
+        if line != ''
+          cmd = "docker rm #{line}"
+          puts cmd if LOG_LEVEL == 'DEBUG'
+          `#{cmd}`
         end
       end
     end
@@ -75,6 +73,7 @@ module Docker
       command = create_docker_command(info)
       puts command if LOG_LEVEL == 'DEBUG'
       if present?(info['name'])
+        skip_first_sleep = true
         puts 'Detected as running. Skipping ....' # if LOG_LEVEL == 'DEBUG'
       else
         `#{command}`
@@ -85,7 +84,8 @@ module Docker
         check['ip'] ||= dockerhost
         detect_check(check)
         while true
-          sleep interval
+          sleep interval unless skip_first_sleep
+          skip_first_sleep = false
           put_char '.' if LOG_LEVEL != 'DEBUG'
           case check['type']
             when 'port'

data/lib/docker_rack/utils.rb

@@ -0,0 +1,25 @@
+# Collection of useful utilities
+class Utils
+  def self.http_get(url)
+    uri = URI.parse(url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Get.new(uri.request_uri, 'Content-Type' => 'application/json')
+
+    http.request(request)
+  end
+
+  def self.http_post(url, json)
+    uri = URI.parse(url)
+
+    json_headers = {'Content-Type' => 'application/json',
+                    'Accept' => 'application/json'}
+
+    http = Net::HTTP.new(uri.host, uri.port)
+
+    response = http.post(uri.path, json.to_json, json_headers)
+    # puts response.code
+    # puts "Response #{response.code} #{response.message}:
+    #       {response.body}"
+    response
+  end
+end

data/lib/docker_rack/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_rack
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Igor Moochnick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -196,6 +196,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -207,6 +208,7 @@ files:
 - lib/docker_rack/container_template.rb
 - lib/docker_rack/dev_environment.rb
 - lib/docker_rack/docker_utils.rb
+- lib/docker_rack/utils.rb
 - lib/docker_rack/version.rb
 - spec/lib/docker_rack/spec_helper.rb
 - spec/lib/docker_rack/task_mngr_spec.rb