drydocker 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2087edb0fea5b7cd272581650bf518a62e0f3cf4
-  data.tar.gz: dbcb288e04130111067a590580cfed6138ecc236
+  metadata.gz: 0f60acdab6aa7f2bde922bd50bfb390dd39f7a3f
+  data.tar.gz: b16eea66d98f207632ff9a89c0aa531612f936ed
 SHA512:
-  metadata.gz: a3e280418b00facbd62f2cc531be552c9c2dd430c7d15e8c883e0f806d30035ce0fb463454a432f7e5bdf34a2855c354dd41b0d226b9b5780685a880eda55de8
-  data.tar.gz: 2890bd0c906e74e463838b10d149d2fe5f539a01a8a682634dfccdf37091c39c99ead52ee4813ec94a4d4da2d4f7e3f78afee34a3b3917784296186c579156ee
+  metadata.gz: 5950ef61f6030f8fa7262b8ab467018dbad8a2a030e159daa4c291a85f95f61f49452287ac418953f75a7c0191f5004b84057c24a6b7930215d9e4dcba0180bd
+  data.tar.gz: 6f6783c43f809a379d928a5c96f6ef5c446599b2474fb4f6b4d33c03dd564f303031450ea00b775220ee052e1098bd5ad5a7cc2d127e518b1ec9232e2c01254b

data/.dockerignore

@@ -0,0 +1,2 @@
+.git
+pkg

data/README.md

@@ -2,7 +2,10 @@
 
 [![wercker status](https://app.wercker.com/status/b00d4339862ef12b880f0022b6d20b2a/s "wercker status")](https://app.wercker.com/project/bykey/b00d4339862ef12b880f0022b6d20b2a)
 
-A project to provide a simple continuous testing tool.
+Drydocker provides a simple wrapper to run tests inside a container every
+time you make a change to your code. It listens to filesystem changes on your
+host and runs a docker command every time it detects anything. It is a
+pre-requisite of use that you have a docker image you can run your tests in.
 
 ## Installation
 
@@ -36,7 +39,7 @@ the output of `drydocker -h` for more information on the flags to use.
 ## Links
 
 * Source code: https://github.com/silarsis/drydocker
-* Build/Test: https://app.wercker.com/status/b00d4339862ef12b880f0022b6d20b2a/s
+* Build/Test: https://app.wercker.com/#applications/54b446f6da3a4af764100e91
 * Docker container: https://registry.hub.docker.com/u/silarsis/drydocker/
 * RubyGem: https://rubygems.org/gems/drydocker
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/drydocker

@@ -5,49 +5,47 @@ require 'optparse'
 
 # Command line parser to setup options
 # :name, :command, :image, :entrypoint, :path
-class DrydockerOptions
-  def self.parse(args)
-    options = Drydocker::Config.default_config
-
-    opt_parser = OptionParser.new do |opts|
-      opts.banner = 'Usage: drydocker [options]'
-      opts.separator ''
-      opts.separator 'Specific options:'
-
-      opts.on('-f', '--filename [FILENAME]', 'File of options to load') do |fn|
-        options.load(fn)
-      end
-
-      opts.on('-n', '--name [NAME]') do |name|
-        options[:name] = name
-      end
-
-      opts.on('-c', '--command [COMMAND]') do |cmd|
-        options[:command] = cmd
-      end
-
-      opts.on('-i', '--image [IMAGE]') do |img|
-        options[:image] = img
-      end
-
-      opts.on('-e', '--entrypoint [ENTRYPOINT]') do |entry|
-        options[:entrypoint] = entry
-      end
-
-      opts.on('-p', '--path [PATH]') do |path|
-        options[:path] = path
-      end
-
-      opts.on('-v', '--[no-]verbose') do |verbose|
-        options[:verbose] = verbose
-      end
+def parse(args)
+  options = Drydocker::Config.default_config
+
+  opt_parser = OptionParser.new do |opts|
+    opts.banner = 'Usage: drydocker [options]'
+    opts.separator ''
+    opts.separator 'Specific options:'
+
+    opts.on('-f', '--filename [FILENAME]', 'File of options to load') do |fn|
+      options.load(fn)
+    end
+
+    opts.on('-n', '--name [NAME]', 'Container name to run tests in, default "<imagename>-test"') do |name|
+      options[:name] = name
+    end
+
+    opts.on('-c', '--command [COMMAND]', "command to run, default '#{options[:command]}'") do |cmd|
+      options[:command] = cmd
+    end
+
+    opts.on('-i', '--image [IMAGE]', "image to run for testing, default '#{options[:image]}'") do |img|
+      options[:image] = img
+    end
+
+    opts.on('-e', '--entrypoint [ENTRYPOINT]', 'entrypoint in case you need to override that, default nil') do |entry|
+      options[:entrypoint] = entry
+    end
+
+    opts.on('-p', '--path [PATH]', "directory to monitor and mount for testing, default '#{options[:path]}'") do |path|
+      options[:path] = path
+    end
+
+    opts.on('-v', '--[no-]verbose', 'verbose output') do |verbose|
+      options[:verbose] = verbose
     end
-    opt_parser.parse!(args)
-    options
   end
+  opt_parser.parse!(args)
+  options
 end
 
-options = DrydockerOptions.parse(ARGV)
+options = parse(ARGV)
 config = Drydocker::Config.new(options)
 monitor = Drydocker::Monitor.new(config)
 monitor.clean_containers

data/drydocker.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: drydocker 0.1.5 ruby lib
+# stub: drydocker 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "drydocker"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kevin Littlejohn"]
-  s.date = "2015-01-13"
+  s.date = "2015-01-14"
   s.description = "Run tests on change in a docker container continuously"
   s.email = "kevin@littlejohn.id.au"
   s.executables = ["drydocker"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".dockerignore",
     ".document",
     ".rubocop.yml",
     "Dockerfile",
@@ -34,8 +35,6 @@ Gem::Specification.new do |s|
     "lib/drydocker.rb",
     "spec/drydocker_spec.rb",
     "spec/spec_helper.rb",
-    "test/helper.rb",
-    "test/test_loop_test.rb",
     "wercker.yml"
   ]
   s.homepage = "http://github.com/silarsis/drydocker"

data/lib/drydocker.rb

@@ -1,10 +1,12 @@
 require 'listen'
 require 'ptools'
+require 'logger'
+require 'shellwords'
 
 module Drydocker
   # Configuration file reader
   class Config
-    attr_reader :name, :command, :image, :entrypoint, :path, :verbose
+    attr_reader :name, :command, :image, :entrypoint, :path, :verbose, :logger
 
     def self.default_config
       {
@@ -22,9 +24,10 @@ module Drydocker
       @image = config[:image]
       @name = config[:name] || name_from_image
       @entrypoint = config[:entrypoint]
-      @command = config[:command]
+      @command = config[:command].shellescape
       @path = config[:path]
-      @verbose = config[:verbose]
+      @logger = Logger.new(STDERR)
+      @logger.level = Logger::DEBUG if config[:verbose]
     end
 
     private
@@ -44,17 +47,17 @@ module Drydocker
 
     def listen
       listener = Listen.to(config.path) do |modified, added, removed|
-        puts "triggering change: #{modified + added + removed}"
+        config.logger.info("triggering change: #{modified + added + removed}")
         run_or_start
       end
       listener.start # not blocking
-      puts 'now listening'
+      config.logger.info('now listening')
     end
 
     def clean_containers
       fail 'No docker found' if File.which('docker').nil?
-      return unless `docker ps | grep #{config.name}`
-      puts 'cleaning up previous containers' if config.verbose
+      return unless system(docker_check_cmd)
+      config.logger.debug('cleaning up previous containers')
       `docker kill #{config.name}`
       `docker rm #{config.name}`
     end
@@ -64,7 +67,7 @@ module Drydocker
     def docker_run_cmd
       %W(
         #{docker_cmd} #{name_opt} #{path_opt} #{entrypoint_opt} #{config.image}
-        #{command}
+        sh -c #{command}
       ).reject { |x| x == '' }.join(' ')
     end
 
@@ -77,7 +80,7 @@ module Drydocker
     end
 
     def docker_cmd
-      'docker run -it'
+      'docker run -it -w /app'
     end
 
     def name_opt
@@ -85,7 +88,7 @@ module Drydocker
     end
 
     def entrypoint_opt
-      config.entrypoint.nil? ? '' : "--entrypoint #{config.entrypoint}"
+      config.entrypoint.nil? ? '' : "--entrypoint #{config.entrypoint.shellescape}"
     end
 
     def path_opt
@@ -97,12 +100,12 @@ module Drydocker
     end
 
     def run
-      puts docker_run_cmd if config.verbose
+      config.logger.debug(docker_run_cmd)
       system(docker_run_cmd)
     end
 
     def start
-      puts docker_start_cmd if config.verbose
+      config.logger.debug(docker_start_cmd)
       system(docker_start_cmd)
     end
 

data/spec/drydocker_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'drydocker'
+require 'shellwords'
 
 # Tests for the main module
 module Drydocker
@@ -9,7 +10,7 @@ module Drydocker
       specify { expect(config.name).to eq 'silarsis-drydocker-test' }
       specify { expect(config.entrypoint).to be_nil }
       specify { expect(config.image).to eq 'silarsis/drydocker' }
-      specify { expect(config.command).to eq 'rspec spec' }
+      specify { expect(config.command).to eq 'rspec spec'.shellescape }
     end
     context 'with provide value for' do
       context 'name' do
@@ -40,7 +41,7 @@ module Drydocker
   end
 
   describe Monitor do
-    let(:config) { Config.new }
+    let(:config) { Config.new(name: 'spec-container') }
     let(:monitor) { Monitor.new(config) }
 
     describe '#monitor' do
@@ -49,7 +50,7 @@ module Drydocker
           .with("docker ps -a | grep #{config.name} >/dev/null") \
           .and_return false
         expect(monitor).to receive(:system) \
-          .with("docker run -it --name #{config.name} -v #{config.path}:/app #{config.image} #{config.command}") \
+          .with("docker run -it -w /app --name #{config.name} -v #{config.path}:/app #{config.image} sh -c #{config.command}") \
           .and_return true
         monitor.send(:run_or_start)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drydocker
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Kevin Littlejohn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -145,6 +145,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".dockerignore"
 - ".document"
 - ".rubocop.yml"
 - Dockerfile
@@ -159,8 +160,6 @@ files:
 - lib/drydocker.rb
 - spec/drydocker_spec.rb
 - spec/spec_helper.rb
-- test/helper.rb
-- test/test_loop_test.rb
 - wercker.yml
 homepage: http://github.com/silarsis/drydocker
 licenses:

data/test/helper.rb

@@ -1,34 +0,0 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'drydocker'
-
-class Test::Unit::TestCase
-end

data/test/test_loop_test.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestDrydocker < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end