drydocker 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d56d9a43969a8ecb6a8d21beba4748f77919f7f
-  data.tar.gz: f21d164b82a9673bba353aba4715bbad82c23e3a
+  metadata.gz: e515536ab04252f04c92cadb6b76e99ab0b1a7b3
+  data.tar.gz: dfb2a251084eaa6ebee891b52c1943d06938b08b
 SHA512:
-  metadata.gz: 65b6cc8827a12ef41b4d4eeb14e3ce3bf35282ab022baba039a8a53e8c4b5ceae6d13507fa8eed1f73cd05387889aeb2f1991583778cd939f4d0e78ccbd886c0
-  data.tar.gz: d919d88b8e89fe948335e39a339b600cb2c3de5a3321fadd5b2f764385d931c2d525850e27462ba02fed6905a880ae90b64821b2f8122ac54cc4d6ba05deea5e
+  metadata.gz: 86942d938f939875ab39bb10c506f9818cb2c7971e7b5ead9a90f034aff785fa4e260632a91de548a355c177faa1a0541d334a360b8dbe0ab7cc65bac379084b
+  data.tar.gz: dd27b38e29a2b4539910289155295526d160846d540863c6307fd9c3b0079cb81016595af162be0466781ac6f7b57a90c757959a7e920f7cdc7650c92d93f65b

data/Gemfile

@@ -9,6 +9,7 @@ gem 'ptools', '~> 1.3'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem 'codeclimate-test-reporter'
   gem 'shoulda', '~> 3.5'
   gem 'rdoc', '~> 3.12'
   gem 'bundler', '~> 1.0'

data/Gemfile.lock

@@ -11,6 +11,8 @@ GEM
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
+    codeclimate-test-reporter (0.4.6)
+      simplecov (>= 0.7.1, < 1.0.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -44,7 +46,7 @@ GEM
       rake
       rdoc
     json (1.8.2)
-    jwt (1.2.0)
+    jwt (1.2.1)
     listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -54,7 +56,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.6.1)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -105,6 +107,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
+  codeclimate-test-reporter
   fuubar (~> 2.0)
   jeweler (~> 2.0)
   listen (~> 2.8)

data/README.md

@@ -1,6 +1,8 @@
 # drydocker
 
 [![wercker status](https://app.wercker.com/status/b00d4339862ef12b880f0022b6d20b2a/m "wercker status")](https://app.wercker.com/project/bykey/b00d4339862ef12b880f0022b6d20b2a)
+[![Code Climate](https://codeclimate.com/github/silarsis/drydocker/badges/gpa.svg)](https://codeclimate.com/github/silarsis/drydocker)
+[![Test Coverage](https://codeclimate.com/github/silarsis/drydocker/badges/coverage.svg)](https://codeclimate.com/github/silarsis/drydocker)
 
 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

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/bin/drydocker

@@ -22,6 +22,10 @@ def parse(args)
       options[:name] = name
     end
 
+    opts.on("-C", "--clean", "clean old container before running") do |clean|
+      options[:clean] = clean
+    end
+
     opts.on("-c", "--command [COMMAND]",
             "command to run, default '#{options[:command]}'") do |cmd|
       options[:command] = cmd
@@ -42,9 +46,18 @@ def parse(args)
       options[:path] = path
     end
 
+    opts.on("-o", "--[no-]once", "run once and exit") do |once|
+      options[:once] = once
+    end
+
     opts.on("-v", "--[no-]verbose", "verbose output") do |verbose|
       options[:verbose] = verbose
     end
+
+    opts.on("--version", "Show version") do
+      puts File.exist?("VERSION") ? File.read("VERSION").strip : ""
+      exit
+    end
   end
   opt_parser.parse!(args)
   options
@@ -53,6 +66,10 @@ end
 options = parse(ARGV)
 config = Drydocker::Config.new(options)
 monitor = Drydocker::Monitor.new(config)
-monitor.clean_containers
-monitor.listen
-sleep
+monitor.clean_containers if options[:clean]
+if options[:once]
+  monitor.run_or_start
+else
+  monitor.listen
+  sleep
+end

data/lib/drydocker.rb

@@ -1,7 +1,7 @@
-require 'listen'
-require 'ptools'
-require 'logger'
-require 'shellwords'
+require "listen"
+require "ptools"
+require "logger"
+require "shellwords"
 
 module Drydocker
   # Configuration file reader
@@ -11,8 +11,8 @@ module Drydocker
     def self.default_config
       {
         name: nil,
-        image: 'silarsis/drydocker',
-        command: 'rspec spec',
+        image: "silarsis/drydocker",
+        command: "rspec spec",
         entrypoint: nil,
         path: `pwd`.strip,
         verbose: false
@@ -33,7 +33,7 @@ module Drydocker
     private
 
     def name_from_image
-      "#{image.gsub(/[\/:]/, '-')}-test"
+      "#{image.gsub(/[\/:]/, "-")}-test"
     end
   end
 
@@ -52,24 +52,29 @@ module Drydocker
         run_or_start
       end
       listener.start # not blocking
-      config.logger.info('now listening')
+      config.logger.info("now listening")
     end
 
     def clean_containers
-      fail 'No docker found' if File.which('docker').nil?
+      fail "No docker found" if File.which("docker").nil?
       return unless system(docker_check_cmd)
-      config.logger.debug('cleaning up previous containers')
+      config.logger.debug("cleaning up previous containers")
       `docker kill #{config.name}`
       `docker rm #{config.name}`
     end
 
+    def run_or_start
+      system(docker_check_cmd) ? start : run
+    end
+
     private
 
     def docker_run_cmd
       %W(
-        #{docker_cmd} #{env_flags} #{name_opt} #{path_opt} #{entrypoint_opt} #{config.image}
-        sh -c #{command}
-      ).reject { |x| x == '' }.join(' ')
+        #{docker_cmd}
+        #{env_flags} #{name_opt} #{path_opt} #{entrypoint_opt}
+        #{config.image} sh -c #{command}
+      ).reject { |x| x == "" }.join(" ")
     end
 
     def env_flags
@@ -85,7 +90,7 @@ module Drydocker
     end
 
     def docker_cmd
-      'docker run -it -w /app'
+      "docker run -it -w /app"
     end
 
     def name_opt
@@ -93,7 +98,8 @@ module Drydocker
     end
 
     def entrypoint_opt
-      config.entrypoint.nil? ? '' : "--entrypoint #{config.entrypoint.shellescape}"
+      return "" if config.entrypoint.nil?
+      "--entrypoint #{config.entrypoint.shellescape}"
     end
 
     def path_opt
@@ -101,7 +107,7 @@ module Drydocker
     end
 
     def command
-      config.command.nil? ? '' : config.command
+      config.command.nil? ? "" : config.command
     end
 
     def run
@@ -113,9 +119,5 @@ module Drydocker
       config.logger.debug(docker_start_cmd)
       system(docker_start_cmd)
     end
-
-    def run_or_start
-      system(docker_check_cmd) ? start : run
-    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 $LOAD_PATH << File.expand_path('./lib')
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drydocker
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Kevin Littlejohn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement