rbdock 0.1.1 → 0.1.2

data/README.md

@@ -8,24 +8,15 @@ Dockerfile to prepare ruby is almost common, so generate its common parts. This
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'rbdock'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install rbdock
-
+```bash
+$ gem install rbdock
+```
 
 ## Usage
 
 ### Create Dockerfile to build ruby
 
-Create `Dockerfile` to build ruby 2.0.0-p353 ready image.
+Create `Dockerfile` to build ruby 2.1.0 ready image.
 
 ```
 $ rbdock 2.1.0

data/bin/rbdock

@@ -1,4 +1,14 @@
 #!/usr/bin/env ruby
 
+argv = ARGV.dup
+
+if argv.include?("--debug")
+  argv.delete("--debug")
+  ENV["RBDOCK_LOG"] = "debug"
+end
+
 require 'rbdock'
+logger = Log4r::Logger.new("rbdock::bin::rbdock")
+logger.info("`rbdock` invoked: #{ARGV.inspect}")
+
 Rbdock::Command.run(ARGV)

data/lib/rbdock.rb

@@ -1,5 +1,47 @@
-require "rbdock/helpers"
+# Enable logging if it is requested.
+require "log4r"
+
+if ENV["RBDOCK_LOG"]
+  require "log4r/config"
+  Log4r.define_levels(*Log4r::Log4rConfig::LogLevels)
+
+  level = nil
+  begin
+    level = Log4r.const_get(ENV["RBDOCK_LOG"].upcase)
+  rescue NameError
+    level = nil
+  end
+
+  level = nil if !level.is_a?(Integer)
+
+  if !level
+    STDERR.puts "Invalid RBDOCK_LOG level is set: #{ENV["RBDOCK_LOG"]}"
+    STDERR.puts "Please use one of the standard log levels: debug, info, warn, or error"
+  end
+
+  if level
+    logger = Log4r::Logger.new("rbdock")
+    logger.outputters = Log4r::Outputter.stderr
+    logger.level = level
+    logger = nil
+  end
+  
+end
+
+# Always make the version avaiable
 require "rbdock/version"
+
+# Display global information
+global_logger = Log4r::Logger.new("rbdock::global")
+global_logger.info("Rbdock version: #{Rbdock::VERSION}")
+global_logger.info("Ruby version: #{RUBY_VERSION}")
+global_logger.info("RubyGems version: #{Gem::VERSION}")
+ENV.each do |k,v|
+  global_logger.info("#{k}=#{v.inspect}") if k =~ /^RBDOCK_/
+end
+
+require "rbdock/helpers"
+
 module Rbdock
   autoload :Command, "rbdock/command"
   autoload :Generate, "rbdock/generate"

data/lib/rbdock/command.rb

@@ -8,7 +8,8 @@ module Rbdock
     end
 
     def initialize argv
-      @argv = argv
+      @logger = Log4r::Logger.new("rbdock::command")
+      @argv   = argv
     end
 
     def execute

data/lib/rbdock/command/options.rb

@@ -5,6 +5,8 @@ module Rbdock
     module Options
       
       def self.parse!(argv)
+
+        # Restore option and its value
         options = {}
 
         set_default_value options
@@ -35,7 +37,7 @@ module Rbdock
           opt.on('--rbenv', desc='Use rbenv') {
             options[:use_rbenv] = true
           }
-          opt.on('--rvm',   desc='Use rvm') {
+          opt.on('--rvm', desc='Use rvm') {
             options[:use_rvm] = true
           }
           opt.on('-a path','--app=path', 'Add Rails/Sinatra app') { |path|
@@ -43,7 +45,8 @@ module Rbdock
           }         
           opt.on('-l','--list', 'List all available ruby versions') {
             list_ruby_versions
-          }          
+          }
+          opt.on('--debug', desc='Run as debug mode')
         end
       end
 
@@ -56,7 +59,7 @@ module Rbdock
       end
 
       def self.show_help opt
-        opt.banner   = "Usage: #{opt.program_name} <ruby-versions> [<args>]"
+        opt.banner   = "Usage: #{opt.program_name} <ruby-versions> [args]"
         opt.on_tail('-h','--help','Show this message') {
           STDERR.puts opt.help
           exit              

data/lib/rbdock/generate.rb

@@ -9,6 +9,9 @@ module Rbdock
     end
     
     def initialize options
+      @logger        = Log4r::Logger.new("rbdock::generate")
+      @logger.info("Generate options: #{options.inspect}")
+      
       @image         = options[:image]
       @ruby_versions = options[:ruby_versions]
       @use_rbenv     = options[:use_rbenv]
@@ -60,6 +63,7 @@ module Rbdock
     end
     
     def default_template
+      @logger.debug("No ruby version manager")
       template = base_package_template
       template << erubis(Rbdock.source_root.join("templates/default/ruby.erb"))           
       template << erubis(Rbdock.source_root.join("templates/default/bundler.erb"))
@@ -68,6 +72,7 @@ module Rbdock
     end
 
     def rbenv_template
+      @logger.debug("Use rbenv for ruby version manager")
       template = base_package_template
       template << erubis(Rbdock.source_root.join("templates/rbenv/ruby.erb"))           
       template << erubis(Rbdock.source_root.join("templates/rbenv/bundler.erb"))
@@ -76,10 +81,12 @@ module Rbdock
     end
 
     def rvm_template
+      @logger.debug("Use rvm for ruby version manager")
       template = base_package_template
       template << erubis(Rbdock.source_root.join("templates/rvm/ruby.erb"))           
       template << erubis(Rbdock.source_root.join("templates/rvm/bundler.erb"))
       template << erubis(Rbdock.source_root.join("templates/rvm/app.erb")) if @app_path
+      template
     end
 
     def self.ruby_versions

data/lib/rbdock/version.rb

@@ -1,3 +1,3 @@
 module Rbdock
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/rbdock.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Rbdock::VERSION
   spec.authors       = ["tcnksm"]
   spec.email         = ["nsd22843@gmail.com"]
-  spec.summary       = %q{Generate Dockerfile which install ruby.}
-  spec.description   = %q{Generate Dockerfile which install ruby.}
+  spec.summary       = %q{Generate Dockerfile for ruby/rails/sinatra.}
+  spec.description   = %q{Generate Dockerfile for ruby or running rails/sinatra.}
   spec.homepage      = "https://github.com/tcnksm/rbdock"
   spec.license       = "MIT"
 
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "erubis", "~> 2.7.0"
+  spec.add_dependency "log4r", "~> 1.1.10"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 2.13"

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rbdock
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
+  prerelease: 
 platform: ruby
 authors:
 - tcnksm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,13 +22,31 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,48 +62,55 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,11 +134,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
-description: Generate Dockerfile which install ruby.
+description: Generate Dockerfile for ruby or running rails/sinatra.
 email:
 - nsd22843@gmail.com
 executables:
@@ -147,27 +178,34 @@ files:
 homepage: https://github.com/tcnksm/rbdock
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1155994554511253811
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1155994554511253811
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: Generate Dockerfile which install ruby.
+specification_version: 3
+summary: Generate Dockerfile for ruby/rails/sinatra.
 test_files:
 - spec/spec_helper.rb
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4cfa13ab4da18f3c1bd1b22ca87701cbb5fcffe7
-  data.tar.gz: 9e2bea8e067608fbe48652f09678bf7e9fbca0c1
-SHA512:
-  metadata.gz: 071c9d4d54e0518575239c329fb610078233283b559de7e49053bfe7d9350b9504c7ab208ac03ace06654b96a61d2a105e4b15a065cce3bca532136b938fc9e1
-  data.tar.gz: f94b85ad27890cd6807be7baed82cf99c662e179e35aab0434669bf33c13aa6d2cfec57e095081c5d8395ff6c792ad66b3eae0aa9bbd5c7f10a244a16abb1c6f