dockerize 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Njg4NjU1MjBhNDkyMmFlMzMwYjhiODIzNDM3MzEwY2RiMzM2NDg2Mg==
-  data.tar.gz: !binary |-
-    Nzg0ZjUwNmE4YWUwZWY0MmFjYjczZDlkZmI2NTQwYzZkNGUwOTczMQ==
+SHA1:
+  metadata.gz: 2fb873e9820733594e16b8c88b4d4603189ccc8c
+  data.tar.gz: d4ffb2154a773bdae945299ad18e0642d87a8ce5
 SHA512:
-  metadata.gz: !binary |-
-    ZTg2OTdjMGJiZDJmYWRlYWJmNTMyYTgzNjczNjU0YjcyMzJmZTNlNzY0YmY2
-    MTVkMjVlZDRjMGQwN2EzNGU4YTNhMDIxZWNiZmVhZDdmMjY0YWY2ZTJiZTZl
-    YmVlMTViOWU0NThlNmMxOTkxMjczYjYyZjFhZGEzYTE0YzYyZDE=
-  data.tar.gz: !binary |-
-    ZTVmMTQ3ZmFhNGM5YWFjZjE2MzNmMGNkZWJmM2IyNjlkNzJkMGUzOTJhYjg1
-    OTE2YTdkYjY4MTU5YjExYzhiMGNiYzc1YzdlNjA0ZGNhODcwYWVmMzU3N2I5
-    MmFmNjRkZWU0Y2M2ODgxYTQxYTU1NDIxNWIyNjc2YTVhN2I5Mjc=
+  metadata.gz: 2fde2e35bea4bd76bbd9ce7f3ef5e3b7b7f9b2610400fe7407e366d1abf4338fb4797b5b5a8b88314883d890dc00642d6bf5fa184ade5d867ffa4a312b25ad2a
+  data.tar.gz: 77ecfa15da9c46fcb3372cb94f306dd6c295e1064e97a144671ec390a50c99ce849307de55d74bee638e328c950f1e00417ed1443d9336db5ce4f29ca94099e0

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --require spec_helper
 --require English
+--order rand

data/.rubocop.yml

@@ -1,8 +1,4 @@
 ---
-AllCops:
-  Excludes:
-    - vendor/**
-
 Documentation:
   Enabled: false
 

data/bin/dockerize

@@ -2,14 +2,11 @@
 # coding: utf-8
 
 lib = File.expand_path('../../lib', __FILE__)
-vendor = File.expand_path('../../vendor', __FILE__)
 
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-$LOAD_PATH.unshift(vendor) unless $LOAD_PATH.include?(vendor)
 
 require 'dockerize'
 require 'dockerize/cli'
-require 'colored'
 
 Dockerize::Cli.run(ARGV)
 exit 0

data/bin/dockerize-unpack

@@ -41,7 +41,7 @@ function main() {
 }
 
 function fetch() {
-  $DOCKER run -v /tmp/docker-bridge:/bridge "$ARGS" "$IMAGE" /docker/run/bridge
+  $DOCKER run -v /tmp/docker-bridge:/bridge $ARGS "$IMAGE" /docker/run/bridge
   tar -xzf /tmp/docker-bridge/run.tar.gz
 }
 

data/dockerize.gemspec

@@ -1,9 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
-vendor = File.expand_path('../vendor', __FILE__)
 
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-$LOAD_PATH.unshift(vendor) unless $LOAD_PATH.include?(vendor)
 
 require 'dockerize/version'
 
@@ -22,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.bindir        = 'bin'
   gem.test_files    = gem.files.grep(%r{^spec/})
-  gem.require_paths = %w(lib vendor)
+  gem.require_paths = %w(lib)
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_development_dependency 'rake'
@@ -32,5 +30,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry' unless RUBY_PLATFORM == 'java'
   gem.add_development_dependency 'simplecov' unless RUBY_PLATFORM == 'java'
 
-  gem.add_runtime_dependency 'syck' if RUBY_VERSION.split('.').first.to_i >= 2
+  gem.add_runtime_dependency 'colorize'
 end

data/lib/dockerize/cli.rb

@@ -28,8 +28,7 @@ module Dockerize
       end
 
       def all_templates
-        Dir["#{Dockerize::Config.template_dir}/**/*.erb"] |
-          Dir["#{Dockerize::Config.template_dir}/**/*.erb"]
+        Dir["#{Dockerize::Config.template_dir}/**/*.erb"]
       end
 
       def set_out_stream

data/lib/dockerize/config.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # rubocop:disable MethodLength, ClassLength, CyclomaticComplexity
 
-require 'trollop'
+require 'optparse'
 
 module Dockerize
   class Config
@@ -10,83 +10,88 @@ module Dockerize
       attr_accessor :opts
 
       def parse(args)
-        config = self
-
-        Trollop.options(args) do
-          text "Usage: dockerize <project directory> [options]\nOptions:\n"
-
+        # defaults
+        @opts = {
+          quiet: false,
+          dry_run: false,
+          force: false,
+          backup: true,
+          registry: ENV['DOCKERIZE_REGISTRY'] || 'quay.io/modcloth',
+          template_dir: ENV['DOCKERIZE_TEMPLATE_DIR'] || "#{top}/templates",
+          maintainer: ENV['DOCKERIZE_MAINTAINER'] ||
+            "#{ENV['USER']} <#{ENV['USER']}@example.com>",
+          from: ENV['DOCKERIZE_FROM'] || 'ubuntu:12.04',
+        }
+
+        OptionParser.new do |opt|
           # -q/--quiet
-          opt :quiet, 'Silence output', type: :flag, short: 'q', default: false
+          opt.on('-q', '--[no-]quiet', 'Silence output') do |q|
+            opts[:quiet] = q
+          end
 
           # -d/--dry-run
-          opt :dry_run, 'Dry run, do not write any files',
-              type: :flag,
-              short: 'd',
-              default: false
+          opt.on(
+            '-d', '--[no-]dry-run', 'Dry run, do not write any files'
+          ) do |d|
+            opts[:dry_run] = d
+          end
 
           # -f/--force
-          opt :force, 'Force existing files to be overwritten',
-              type: :flag,
-              short: 'f',
-              default: false
+          opt.on(
+            '-f', '--[no-]force', 'Force existing files to be overwritten'
+          ) { |f| opts[:force] = f }
 
           # -b/--backup
-          opt :backup, 'Creates .bak version of files before overwriting them',
-              type: :flag,
-              short: 'b',
-              default: true
+          opt.on(
+            '-b',
+            '--[no-]backup',
+            'Creates .bak version of files before overwriting them',
+          ) { |b| opts[:backup] = b }
 
           # -r/--registry
-          opt :registry, 'The Docker registry to use when writing files',
-              type: :string,
-              short: 'r',
-              default: ENV['DOCKERIZE_REGISTRY'] || 'quay.io/modcloth'
+          opt.on(
+            '-r REGISTRY',
+            '--registry REGISTRY',
+            'The Docker registry to use when writing files'
+          ) { |r| opts[:registry] = r }
 
           # -t/--template-dir
-          opt :template_dir,
-              'The directory containing the templates to be written',
-              type: :string,
-              short: 't',
-              default: ENV['DOCKERIZE_TEMPLATE_DIR'] ||
-                "#{config.top}/templates"
+          opt.on(
+            '-t TEMPLATE_DIR',
+            '--template-dir TEMPLATE_DIR',
+            'The directory containing the templates to be written',
+          ) { |t| opts[:template_dir] = t }
 
           # -m/--maintainer
-          opt :maintainer,
-              'The default MAINTAINER to use for any Dockerfiles written',
-              type: :string,
-              short: 'm',
-              default: ENV['DOCKERIZE_MAINTAINER'] ||
-                "#{ENV['USER']} <#{ENV['USER']}@example.com>"
+          opt.on(
+            '-m MAINTAINER',
+            '--maintainer MAINTAINER',
+            'The default MAINTAINER to use for any Dockerfiles written'
+          ) { |m| opts[:maintainer] = m }
 
           # -F/--from
-          opt :from,
-              'The default base image to use for any Dockerfiles written',
-              type: :string,
-              short: 'F',
-              default: ENV['DOCKERIZE_FROM'] || 'ubuntu:12.04'
-
-          version "dockerize #{Dockerize::VERSION}"
-
-          begin
-            config.send(:opts=, parse(args))
-          rescue Trollop::CommandlineError => e
-            $stderr.puts "Error: #{e.message}."
-            $stderr.puts 'Try --help for help.'
-            exit 1
-          rescue Trollop::HelpNeeded
-            educate
-            exit
-          rescue Trollop::VersionNeeded
-            $stderr.puts version
+          opt.on(
+            '-F FROM',
+            '--from FROM',
+            'The default base image to use for any Dockerfiles written'
+          ) { |f| opts[:from] = f }
+
+          # -h/--help
+          opt.on_tail('-h', '--help', 'Display this message') do
+            $stderr.puts opt.help
             exit
           end
 
-          config.send(:opts)[:top] = config.top
-          config.send(:generate_accessor_methods, self)
-        end
+          # -v/--version
+          opt.on_tail('-v', '--version', 'Show version and exit') do
+            $stderr.puts "dockerize #{Dockerize::VERSION}"
+            exit
+          end
+        end.parse!(args)
 
         self.project_dir = args[0]
         set_project_name unless opts[:project_name]
+        generate_accessor_methods
       end
 
       def project_dir=(dir)
@@ -126,13 +131,15 @@ module Dockerize
         klass.send(:define_method, name.to_sym, &block)
       end
 
-      def generate_accessor_methods(parser)
-        parser.specs.map do |k, v|
-          case v[:type]
-          when *Trollop::Parser::FLAG_TYPES
-            add_method("#{k}?") { @opts[k] }
-          when :string
-            add_method("#{k}") { @opts[k] }
+      def generate_accessor_methods
+        opts.each do |k, v|
+          case v
+          when TrueClass, FalseClass
+            add_method("#{k}?") { opts[k] }
+          when String
+            add_method("#{k}") { opts[k] }
+          else
+            fail OptionParser::InvalidOption, "Invalid option #{k}"
           end
         end
       end

data/lib/dockerize/document_writer.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 require 'fileutils'
-require 'colored'
+require 'colorize'
 
 module Dockerize
   class DocumentWriter

data/lib/dockerize/version.rb

@@ -2,6 +2,6 @@
 
 unless defined?(Dockerize::VERSION)
   module Dockerize
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/lib/dockerize/config_spec.rb

@@ -144,6 +144,42 @@ describe Dockerize::Config do
         run '.'
         config.template_dir.should == "#{top}/templates"
       end
+
+      it 'sets the template dir correctly' do
+        tmpdir do |tmp|
+          run %W(. --template-dir #{tmp})
+          config.template_dir.should == tmp
+        end
+      end
+    end
+
+    describe 'maintainer' do
+      let(:maintainer) { 'Foo Bar <foobar@example.com>' }
+
+      it 'sets the correct default maintainer' do
+        run '.'
+        config.maintainer.should ==
+          "#{ENV['USER']} <#{ENV['USER']}@example.com>"
+      end
+
+      it 'sets the maintainer as specified' do
+        run %W(. --maintainer #{maintainer})
+        config.maintainer.should == maintainer
+      end
+    end
+
+    describe 'from' do
+      let(:from) { 'base_image' }
+
+      it 'sets the correct default base image' do
+        run '.'
+        config.from.should == 'ubuntu:12.04'
+      end
+
+      it 'sets the base image as specified' do
+        run %W(. --from #{from})
+        config.from.should == from
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'bundler/setup'
 require 'simplecov' unless RUBY_PLATFORM == 'java'
 require 'pry' unless RUBY_PLATFORM == 'java'
 require 'tmpdir'
-require 'colored'
 
 def tmpdir(&block)
   Dir.mktmpdir('dockerize-spec') do |tmp|

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: dockerize
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rafe Colton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rubocop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: colorize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
   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'
+  type: :runtime
 description: Dockerizes your application
 email:
 - r.colton@modcloth.com
@@ -122,34 +108,30 @@ files:
 - templates/run_makefile_run.erb
 - templates/vagrant_provision_sh.erb
 - templates/vagrantfile.erb
-- vendor/colored.rb
-- vendor/trollop.rb
 homepage: https://github.com/modcloth-labs/dockerize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- vendor
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
-summary: Creates a templated Dockerfile and corresponding support files for easy deployment
-  with docker.
+summary: Creates a templated Dockerfile and corresponding support files for easy deployment with docker.
 test_files:
 - spec/lib/dockerize/cli_spec.rb
 - spec/lib/dockerize/config_spec.rb
@@ -157,4 +139,3 @@ test_files:
 - spec/lib/dockerize/template_parser_spec.rb
 - spec/lib/dockerize_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/vendor/colored.rb

@@ -1,93 +0,0 @@
-require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
-
-# Source: https://github.com/defunkt/colored
-
-##
-# cute.
-#
-#   >> "this is red".red
-#
-#   >> "this is red with a blue background (read: ugly)".red_on_blue
-#
-#   >> "this is red with an underline".red.underline
-#
-#   >> "this is really bold and really blue".bold.blue
-#
-#   >> Colored.red "This is red" # but this part is mostly untested
-module Colored
-  extend self
-
-  COLORS = {
-    'black'   => 30,
-    'red'     => 31,
-    'green'   => 32,
-    'yellow'  => 33,
-    'blue'    => 34,
-    'magenta' => 35,
-    'cyan'    => 36,
-    'white'   => 37
-  }
-
-  EXTRAS = {
-    'clear'     => 0,
-    'bold'      => 1,
-    'underline' => 4,
-    'reversed'  => 7
-  }
-
-  COLORS.each do |color, value|
-    define_method(color) do 
-      colorize(self, :foreground => color)
-    end
-
-    define_method("on_#{color}") do
-      colorize(self, :background => color)
-    end
-
-    COLORS.each do |highlight, value|
-      next if color == highlight
-      define_method("#{color}_on_#{highlight}") do
-        colorize(self, :foreground => color, :background => highlight)
-      end
-    end
-  end
-
-  EXTRAS.each do |extra, value|
-    next if extra == 'clear'
-    define_method(extra) do 
-      colorize(self, :extra => extra)
-    end
-  end
-
-  define_method(:to_eol) do
-    tmp = sub(/^(\e\[[\[\e0-9;m]+m)/, "\\1\e[2K")
-    if tmp == self
-      return "\e[2K" << self
-    end
-    tmp
-  end
-
-  def colorize(string, options = {})
-    colored = [color(options[:foreground]), color("on_#{options[:background]}"), extra(options[:extra])].compact * ''
-    colored << string
-    colored << extra(:clear)
-  end
-
-  def colors
-    @@colors ||= COLORS.keys.sort
-  end
-
-  def extra(extra_name)
-    extra_name = extra_name.to_s
-    "\e[#{EXTRAS[extra_name]}m" if EXTRAS[extra_name]
-  end
-
-  def color(color_name)
-    background = color_name.to_s =~ /on_/
-    color_name = color_name.to_s.sub('on_', '')
-    return unless color_name && COLORS[color_name]
-    "\e[#{COLORS[color_name] + (background ? 10 : 0)}m" 
-  end
-end unless Object.const_defined? :Colored
-
-String.send(:include, Colored)