http_stub_docker 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bfa76e30d19a57a04a55173ea3dc94d1323752d
-  data.tar.gz: ccc0b10f133d5d701c6f2e53bc7fc5bc5c36787e
+  metadata.gz: 8b1404249f82152818d7773190064df58bd63409
+  data.tar.gz: 6725e6f4558a4430829dc56967c1eb968cf1600b
 SHA512:
-  metadata.gz: bd30a56a11e4affa80610ea7ba04343165c224bb09e8bf5a18bc8df0061f1c0673f9c8e829364fda52f920d41a28461d7798f3c5f5428d222f55fdc2fa17eb15
-  data.tar.gz: 8b4ba1fdf59bdb00d30cf346161aa8da95877f4e190aeca61592b437a07fd6b0301b4309687fd181d64c423a229381b93ce20a3fcfe5c5f944e1862991abbc71
+  metadata.gz: 54163a6a149cd3f500a8e68f0d0a3ee4efa1b396acc46cc02b4e69bb341971e8c4b12c4f80e48b8cad30e116cf7641a95cf36f98557130b8c1bc8def68c89ee2
+  data.tar.gz: 440258503904442758090e735702688de3f2c5c5651c2cc691863ced71bf16e54dddb6df88184cfc771c59c80ae17c9f4c14e5e363fa599642ebb1a1b27ad6bc

data/lib/http_stub_docker/rake/arguments.rb

@@ -0,0 +1,28 @@
+module HttpStubDocker
+  module Rake
+
+    class Arguments
+
+      DEFAULT_PORT = 5000
+
+      private_constant :DEFAULT_PORT
+
+      attr_reader :configurer, :stub_name, :stub_dir, :port, :external_base_uri, :version, :task_prefix
+
+      def initialize(args)
+        @port = DEFAULT_PORT
+        args.each { |name, value| self.instance_variable_set("@#{name}", value) }
+        @external_base_uri ||= "http://localhost:#{@port}"
+        @task_prefix = current_rake_namespace
+      end
+
+      private
+
+      def current_rake_namespace
+        ::Rake.application.current_scope.empty? ? "" : "#{::Rake.application.current_scope.to_a.reverse.join(":")}:"
+      end
+
+    end
+
+  end
+end

data/lib/http_stub_docker/rake/container_tasks.rb

@@ -15,7 +15,7 @@ module HttpStubDocker
       def define_build_task(args)
         desc "Builds the image"
         task(:build) do
-          system "docker build -t #{args[:stub_name]} ."
+          system "docker build -t #{args.stub_name} ."
         end
       end
 
@@ -23,9 +23,9 @@ module HttpStubDocker
         desc "Starts a container"
         task(:start) do
           system "docker run -d " \
-                 "-p #{args[:port]}:80 " \
-                 "-e STUB_EXTERNAL_BASE_URI=#{args[:external_base_uri]} " \
-                 "#{args[:stub_name]}"
+                 "-p #{args.port}:#{args.port} " \
+                 "-e STUB_EXTERNAL_BASE_URI=#{args.external_base_uri} " \
+                 "#{args.stub_name}"
         end
       end
 
@@ -44,7 +44,7 @@ module HttpStubDocker
       end
 
       def container_ids(args)
-        `docker ps -a --filter ancestor=#{args[:stub_name]} --format "{{.ID}}"`.split
+        `docker ps -a --filter ancestor=#{args.stub_name} --format "{{.ID}}"`.split
       end
 
     end

data/lib/http_stub_docker/rake/pipeline_tasks.rb

@@ -9,7 +9,7 @@ module HttpStubDocker
 
       def initialize(args)
         define_test_task(args)
-        define_commit_task
+        define_commit_task(args)
         define_publish_task(args)
       end
 
@@ -19,29 +19,29 @@ module HttpStubDocker
         desc "Verifies container is running"
         task(:test) do
           Bundler.require(:test)
-          Wait.until!(description: "#{args[:stub_name]} is running", timeout_in_seconds: 10) do
-            response = Net::HTTP.get_response(URI("#{args[:external_base_uri]}/http_stub"))
-            raise "#{args[:stub_name]} is not running" unless response.code == "200"
+          Wait.until!(description: "#{args.stub_name} is running", timeout_in_seconds: 10) do
+            response = Net::HTTP.get_response(URI("#{args.external_base_uri}/http_stub"))
+            raise "#{args.stub_name} is not running" unless response.code == "200"
           end
-          puts "#{args[:stub_name]} is running"
+          puts "#{args.stub_name} is running"
         end
       end
 
-      def define_commit_task
+      def define_commit_task(args)
         desc "Ensures container runs"
-        task(commit: %w{ docker:build docker:start }) do
+        task(commit: [ "#{args.task_prefix}docker:build", "#{args.task_prefix}docker:start" ]) do
           begin
-            ::Rake::Task["docker:test"].invoke
+            ::Rake::Task["#{args.task_prefix}docker:test"].invoke
           ensure
-            ::Rake::Task["docker:stop"].invoke
+            ::Rake::Task["#{args.task_prefix}docker:stop"].invoke
           end
         end
       end
 
       def define_publish_task(args)
         desc "Publishes the container"
-        task(publish: "docker:build") do
-          system "#{PUBLISH_SCRIPT} #{args[:stub_name]} #{args[:version]}"
+        task(publish: "#{args.task_prefix}docker:build") do
+          system "#{PUBLISH_SCRIPT} #{args.stub_name} #{args.version}"
         end
       end
 

data/lib/http_stub_docker/rake/resource_tasks.rb

@@ -3,6 +3,11 @@ module HttpStubDocker
 
     class ResourceTasks < ::Rake::TaskLib
 
+      RESOURCE_DIR             = "#{HttpStubDocker::BASE_DIR}/resource".freeze
+      DOCKERFILE_TEMPLATE_PATH = "#{RESOURCE_DIR}/Dockerfile.erb".freeze
+
+      private_constant :RESOURCE_DIR, :DOCKERFILE_TEMPLATE_PATH
+
       def initialize(args)
         define_clobber_task(args)
         define_setup_task(args)
@@ -13,18 +18,37 @@ module HttpStubDocker
       def define_clobber_task(args)
         desc "Removes created Dockerfile and other resources"
         task(:clobber) do
-          resources = Dir.entries("#{HttpStubDocker::BASE_DIR}/resource").find_all { |file| !File.directory?(file) }
-          rm resources.map { |resource| "#{args[:stub_dir]}/#{resource}" }, force: true
+          resources = Dir.entries("#{HttpStubDocker::BASE_DIR}/resource")
+                         .reject { |file| File.directory?(file) }
+                         .map    { |file| file.end_with?(".erb") ? file[0..-5] : file }
+          rm resources.map { |resource| "#{args.stub_dir}/#{resource}" }, force: true
         end
       end
 
       def define_setup_task(args)
         desc "Creates Dockerfile and other resources in stub directory"
         task(:setup) do
-          cp_r "#{HttpStubDocker::BASE_DIR}/resource/.", args[:stub_dir]
+          copy_template_files(args)
+          copy_non_template_files(args)
         end
       end
 
+      def copy_non_template_files(args)
+        files = Dir.entries(RESOURCE_DIR)
+                   .reject { |file| File.directory?(file) || file.end_with?(".erb") }
+                   .map { |file| "#{RESOURCE_DIR}/#{file}" }
+        files.map { |file| "#{args.stub_dir}/#{File.basename(file)}" }
+             .select { |destination_file| File.exist?(destination_file) }
+             .each { |destination_file| rm_f(destination_file) }
+        cp_r files, args.stub_dir
+      end
+
+      def copy_template_files(args)
+        dockerfile_erb     = ERB.new(File.read(DOCKERFILE_TEMPLATE_PATH))
+        dockerfile_content = dockerfile_erb.result(args.instance_eval { binding })
+        File.write("#{args.stub_dir}/Dockerfile", dockerfile_content)
+      end
+
     end
 
   end

data/lib/http_stub_docker/rake/server_daemon_tasks.rb

@@ -4,12 +4,12 @@ module HttpStubDocker
     class ServerDaemonTasks
 
       def initialize(args)
-        HttpStub::Server::Daemon.log_dir = ::File.expand_path("#{args[:stub_dir]}/tmp/log", __FILE__)
-        HttpStub::Server::Daemon.pid_dir = ::File.expand_path("#{args[:stub_dir]}/tmp/pids", __FILE__)
+        HttpStub::Server::Daemon.log_dir = ::File.expand_path("#{args.stub_dir}/tmp/log", __FILE__)
+        HttpStub::Server::Daemon.pid_dir = ::File.expand_path("#{args.stub_dir}/tmp/pids", __FILE__)
 
-        configurer = args[:configurer]
+        configurer = args.configurer
         configurer.stub_server.host = "localhost"
-        configurer.stub_server.port = 80
+        configurer.stub_server.port = args.port
         HttpStub::Rake::ServerDaemonTasks.new(name: :stub_server, configurer: configurer)
       end
 

data/lib/http_stub_docker/rake/task_generator.rb

@@ -3,22 +3,19 @@ module HttpStubDocker
 
     class TaskGenerator < ::Rake::TaskLib
 
-      DEFAULT_PORT        = 5000
       DOCKER_TASK_CLASSES = [
         HttpStubDocker::Rake::ResourceTasks,
         HttpStubDocker::Rake::ContainerTasks,
         HttpStubDocker::Rake::PipelineTasks
       ].freeze
 
-      private_constant :DEFAULT_PORT, :DOCKER_TASK_CLASSES
+      private_constant :DOCKER_TASK_CLASSES
 
       def initialize(args)
-        resolved_args = args
-        resolved_args[:port]              ||= DEFAULT_PORT
-        resolved_args[:external_base_uri] ||= "http://localhost:#{resolved_args[:port]}"
-        HttpStubDocker::Rake::ServerDaemonTasks.new(resolved_args)
+        arguments = HttpStubDocker::Rake::Arguments.new(args)
+        HttpStubDocker::Rake::ServerDaemonTasks.new(arguments)
         namespace :docker do
-          DOCKER_TASK_CLASSES.each { |task_class| task_class.new(resolved_args) }
+          DOCKER_TASK_CLASSES.each { |task_class| task_class.new(arguments) }
         end
       end
 

data/lib/http_stub_docker.rb

@@ -6,6 +6,7 @@ module HttpStubDocker
 
 end
 
+require_relative 'http_stub_docker/rake/arguments'
 require_relative 'http_stub_docker/rake/server_daemon_tasks'
 require_relative 'http_stub_docker/rake/resource_tasks'
 require_relative 'http_stub_docker/rake/container_tasks'

data/resource/.dockerignore

@@ -7,6 +7,6 @@
 .gitignore
 .travis.yml
 bin
-Dockerfile
+Dockerfile.erb
 log
 tmp

data/resource/{Dockerfile → Dockerfile.erb}

@@ -16,7 +16,7 @@ WORKDIR /root/app
 RUN bundle install --without development
 
 # Expose server port
-EXPOSE 80
+EXPOSE <%= port %>
 
 # Start server & tail logs in order to sustain foreground process
 CMD trap exit TERM; bundle exec rake stub_server:start && tail -f tmp/log/stub_server_console.log

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_stub_docker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - dueckes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.43'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: wait_until
   requirement: !ruby/object:Gem::Requirement
@@ -88,13 +88,14 @@ extra_rdoc_files: []
 files:
 - "./bin/push_docker_image_to_ecr.sh"
 - "./lib/http_stub_docker.rb"
+- "./lib/http_stub_docker/rake/arguments.rb"
 - "./lib/http_stub_docker/rake/container_tasks.rb"
 - "./lib/http_stub_docker/rake/pipeline_tasks.rb"
 - "./lib/http_stub_docker/rake/resource_tasks.rb"
 - "./lib/http_stub_docker/rake/server_daemon_tasks.rb"
 - "./lib/http_stub_docker/rake/task_generator.rb"
 - "./resource/.dockerignore"
-- "./resource/Dockerfile"
+- "./resource/Dockerfile.erb"
 homepage: http://github.com/MYOB-Technology/http_stub_docker
 licenses:
 - MIT