rbdock 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ebf65d187e5af4dcec123c8d3939e029e0eb07
-  data.tar.gz: cec4596d55f0455bebbb3fbfae105b728e34b176
+  metadata.gz: 6360827063092435950892991e08acb8e23a1843
+  data.tar.gz: 8ca404388d1a24a82901d1fd7f93206cc89c548b
 SHA512:
-  metadata.gz: cbf2a52837f3426aef0c82202f899fafd1a7ca01322d4804c521b214bac1613176c6b4cc9a6cb402b1b8489729a2226b335d5e9fe6634d62778d8437660757f1
-  data.tar.gz: ca929580895d3e9e1261339b56460628c692617de8b31a604f8bfcddab4672dae3f7a1036486d7195ff563b374daedacc44df230a502c7984557b7b980ba859c
+  metadata.gz: 6aa31f36757676489cbd1139ba1f98fd1518496c6d6c1a10ce58ad1753053c1949425d2b02c3ba890f2fad9d148afc0045402403bb56047cb9b9e3032ebb84df
+  data.tar.gz: 3eb3ebb1d5e6e29d9df8067c4da66c6af825b659f7ed412c61d1d2dee0a1179c39982d2eaac9afc7f00008726d9d6020b9ee1cb30583ed79021978ba09b238da

data/.gitignore

@@ -17,4 +17,6 @@ test/version_tmp
 tmp
 Dockerfile
 .vagrant
-vendor/
+vendor/
+.rbdock_app
+myapp/

data/README.md

@@ -2,7 +2,9 @@
 
 [![Gem Version](https://badge.fury.io/rb/rbdock.png)](http://badge.fury.io/rb/rbdock)
 
-Generate Dockerfile to build ruby ready image.
+Generate Dockerfile for Ruby or Rails, Sinatra.
+
+Dockerfile to prepare ruby is almost common, so generate its common parts. This is still experimetal and under heavy construction.
 
 ## Installation
 
@@ -21,17 +23,46 @@ Or install it yourself as:
 
 ## Usage
 
+### Create Dockerfile to build ruby
+
 Create `Dockerfile` to build ruby 2.0.0-p353 ready image.
 
 ```
-$ rbdock create 2.0.0-p353
+$ rbdock 2.1.0
+```
+
+It generates this [Dockerfile](https://gist.github.com/tcnksm/9388685). 
+
+You can create `Dockerfile` to build multiple versions of ruby by rbenv or rvm.
+
+```
+$ rbdock 2.0.0-p353 1.9.3-p484 -i centos
 ```
 
-You can create `Dockerfile` to build multiple versions of ruby.
+It generates this [Dockerfile](https://gist.github.com/tcnksm/9388736). 
+
+
+### Create Dockerfile for rails/sinatra application
+
+For example, you can work with rails application developed on local environment. 
+
+```
+$ rails new my_rails_app
+$ rbdock 2.1.0 --app my_rails_app --rbenv
+$ docker build -t tcnksm/rails_app .
+$ docker run -i -p 3000:3000 -t tcnksm/rails_app 'rails server'
+```
+
+It generates this [Dockerfile](https://gist.github.com/tcnksm/9389036). 
+
+You can work with application hosted on remote repository. For example, this is my sinatra application hosted on github. 
 
 ```
-$ rbdock create 2.0.0-p353 1.9.3-p484
+$ rbdock 2.0.0-p353 --app https://github.com/tcnksm/trying-space
+$ docker build -t tcnksm/sinatra_app .
+$ docker run -i -p 8080:8080 -t tcnksm/my_sinatra_app 'rackup -p 8080'
 ```
+It generates this [Dockerfile](https://gist.github.com/tcnksm/9389116). Your application will be cloned to local directory (`.rbdock_app`) and `ADD` to docker image.
 
 ### Options
 
@@ -40,6 +71,7 @@ $ rbdock create 2.0.0-p353 1.9.3-p484
 |--image `name`| Set base image. Now `ubuntu` or `cenos` is avalable. Default is `ubuntu`.|
 |--rbenv| Use [rbenv](https://github.com/sstephenson/rbenv) to manage ruby installation|
 |--rvm  | Use [rvm](https://github.com/wayneeseguin/rvm) to manage ruby installation|
+|--app `url` | Add Rails/Sinatra application. You can set local path or remote host|
 |--list | List all available ruby versions.|
 
 

data/Vagrantfile

@@ -1,20 +1,8 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-DOCKER_URL = "192.168.50.4"
-DOCKER_PORT = 5422
-
 Vagrant.configure("2") do |config|
   config.vm.box = "precise64"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-  config.vm.network :private_network, ip: DOCKER_URL
+  config.vm.network :private_network, ip: "192.168.50.4"
   config.vm.provision :docker do |d|
     d.pull_images "ubuntu"
-    d.pull_images "centos"
-  end
-  config.vm.provision :shell, :inline => <<-PREPARE
-  sudo sed -i -e 's/DOCKER_OPTS=/DOCKER_OPTS=\"-H 0.0.0.0:#{DOCKER_PORT}\"/g' /etc/init/docker.conf
-  sudo service docker stop
-  sudo service docker start
-  PREPARE
+  end  
 end

data/lib/rbdock.rb

@@ -2,6 +2,5 @@ require "rbdock/helpers"
 require "rbdock/version"
 module Rbdock
   autoload :Command, "rbdock/command"
-  # sub commands
-  autoload :Create, "rbdock/create"
+  autoload :Generate, "rbdock/generate"
 end

data/lib/rbdock/command.rb

@@ -12,13 +12,11 @@ module Rbdock
     end
 
     def execute
-      options     = Options.parse!(@argv)
-      sub_command = options.delete(:command)
-
-      case sub_command
-      when 'create'
-        Rbdock::Create.run(options)
+      options = Options.parse!(@argv)
+      if options[:app]
+        options[:app_path] = Rbdock.clone_app_to_local(options[:app])
       end
+      Rbdock::Generate.run(options)
     rescue => e
       abort "Error: #{e.message}"
     end

data/lib/rbdock/command/options.rb

@@ -7,96 +7,85 @@ module Rbdock
       def self.parse!(argv)
         options = {}
 
-        command_parser     = create_command_parser
-        sub_command_parser = create_sub_command_parser(options)
+        set_default_value options
+        command_parser = create_command_parser options
         
         begin
-          command_parser.order!(argv)          
-          options[:command] = argv.shift          
-          sub_command_parser[options[:command]].parse!(argv)
+          command_parser.parse!(argv)          
           ruby_version_perser options, argv
         rescue OptionParser::MissingArgument, OptionParser::InvalidOption, ArgumentError => e
           abort e.message
         end
-
+        
         options
       end
 
-      def self.create_command_parser
+      def self.set_default_value options
+        options[:image] = "ubuntu"
+      end
+
+      def self.create_command_parser options
         OptionParser.new do |opt|
-          opt.on_head('-v','--version','Show version') {
-            opt.version = Rbdock::VERSION
-            STDERR.puts opt.ver
-            exit              
-          }
+          show_version opt
+          show_help opt
 
-          opt.banner   = "Usage: #{opt.program_name} [-h|--help] [-v|--version] <command> [<args>]"
-          opt.separator  ''
-          opt.separator  "#{opt.program_name} Available Commands:"
-          sub_command_help.each do |command|
-            opt.separator [opt.summary_indent, command[:name].ljust(40), command[:summary]].join(' ')
-          end
-          opt.on_head('-h','--help','Show this message') {
-            STDERR.puts opt.help
-            exit              
+          opt.on('-i name','--image=name', 'Set image name(ubuntu|centos)') { |v|
+            options[:image] = v
+          }
+          opt.on('--rbenv', desc='Use rbenv') {
+            options[:use_rbenv] = true
+          }
+          opt.on('--rvm',   desc='Use rvm') {
+            options[:use_rvm] = true
+          }
+          opt.on('-a path','--app=path', 'Add Rails/Sinatra app') { |path|
+            options[:app] = path
           }         
+          opt.on('-l','--list', 'List all available ruby versions') {
+            list_ruby_versions
+          }          
         end
       end
 
-      def self.create_sub_command_parser options
-        parser = Hash.new do |k,v|
-          raise ArgumentError, "'#{v}' is not sub command."
-        end
-        
-        parser['create'] = OptionParser.new do |opt|
-          options[:image] = "ubuntu" # default value
-          opt.banner = 'Usage: create <ruby-versions> [<args>]'          
-          opt.on('-i name','--image=name', 'Set image name(ubuntu|centos)') { |val|
-            options[:image] = val
-          }
-          opt.on('--rbenv', desc='Use rbenv') {|f| options[:use_rbenv] = true }
-          opt.on('--rvm',   desc='Use rvm')   {|f| options[:use_rvm] = true }
-          opt.on('-l','--list', 'List all available ruby versions') { list_ruby_versions }
-          opt.on_tail('-h','--help', 'Show this message') { help_sub_command(opt) }
-        end
-        
-        parser
+      def self.show_version opt        
+        opt.on_tail('-v','--version','Show version') {
+          opt.version = Rbdock::VERSION
+          STDERR.puts opt.ver
+          exit              
+        }        
+      end
+
+      def self.show_help opt
+        opt.banner   = "Usage: #{opt.program_name} <ruby-versions> [<args>]"
+        opt.on_tail('-h','--help','Show this message') {
+          STDERR.puts opt.help
+          exit              
+        }
       end
 
       def self.ruby_version_perser options, argv
-        if options[:command] == 'create'
-          raise ArgumentError, "#{options[:command]} ruby versions not founnd." if argv.empty?
-          check_version_avaiable argv
-          options[:ruby_versions] = argv
-        end
+        raise ArgumentError, "#{options[:command]} ruby versions not found." if argv.empty?
+        check_version_avaiable argv
+        options[:ruby_versions] = argv
         options
       end
 
       def self.check_version_avaiable argv
         argv.each do |v|
-          if not Rbdock::Create.ruby_versions.include? v
-            raise ArgumentError, "Definition not found: #{v} \n\nYou can list all available ruby versions with `rbdock create --list'."            
+          if not Rbdock::Generate.ruby_versions.include? v
+            raise ArgumentError, "Definition not found: #{v} \n\nYou can list all available ruby versions with `rbdock --list'."            
           end
         end
       end
 
       def self.list_ruby_versions
         STDERR.print "Available versions:\n   "
-        STDERR.print Rbdock::Create.ruby_versions.join("\n   ")
+        STDERR.print Rbdock::Generate.ruby_versions.join("\n   ")
         STDERR.puts
         exit
       end
-
-      def self.help_sub_command parser
-        STDERR.puts parser.help
-        exit
-      end
-
-      def self.sub_command_help
-        [
-         {name: 'create <ruby-versions> -i <image>', summary: 'Generate Dockerfile which installs <ruby-versions>'}
-        ]
-      end
+      
     end
   end
 end
+

data/lib/rbdock/{create.rb → generate.rb}

@@ -2,10 +2,10 @@ require "erubis"
 
 module Rbdock
 
-  class Create
+  class Generate
 
     def self.run options
-      new(options).generate
+      new(options).execute
     end
     
     def initialize options
@@ -13,15 +13,15 @@ module Rbdock
       @ruby_versions = options[:ruby_versions]
       @use_rbenv     = options[:use_rbenv]
       @use_rvm       = options[:use_rvm]
+      @app_path      = options[:app_path]
     end
 
-    def generate      
+    def execute      
       if @use_rbenv
         safe_write rbenv_template
       elsif @use_rvm
         safe_write rvm_template
       elsif mutiple_rubies?
-        # Use rbenv for default installing multiple rubies
         safe_write rbenv_template
       else
         safe_write default_template
@@ -51,37 +51,35 @@ module Rbdock
       @ruby_versions.length > 1
     end
 
+    def erubis template_path
+      Erubis::Eruby.new(template_path.read, trim: true).result(binding)
+    end
+
+    def base_package_template
+      erubis Rbdock.source_root.join("templates/base_package/#{@image}.erb")
+    end
+    
     def default_template
-      template_path = Rbdock.source_root.join("templates/#{@image}_base_packages.erb")
-      template = Erubis::Eruby.new(template_path.read, trim: true).result(binding)
-      
-      template_path = Rbdock.source_root.join("templates/ruby.erb")
-      template << Erubis::Eruby.new(template_path.read, trim: true).result(binding)
-      
-      template_path = Rbdock.source_root.join("templates/bundler.erb")
-      template << Erubis::Eruby.new(template_path.read, trim: true).result(binding)      
+      template = base_package_template
+      template << erubis(Rbdock.source_root.join("templates/default/ruby.erb"))           
+      template << erubis(Rbdock.source_root.join("templates/default/bundler.erb"))
+      template << erubis(Rbdock.source_root.join("templates/default/app.erb")) if @app_path
+      template
     end
 
     def rbenv_template
-      template_path = Rbdock.source_root.join("templates/#{@image}_base_packages.erb")
-      template = Erubis::Eruby.new(template_path.read, trim: true).result(binding)
-      
-      template_path = Rbdock.source_root.join("templates/rbenv_ruby.erb")
-      template << Erubis::Eruby.new(template_path.read, trim: true).result(binding)
-      
-      template_path = Rbdock.source_root.join("templates/rbenv_bundler.erb")
-      template << Erubis::Eruby.new(template_path.read, trim: true).result(binding)      
+      template = base_package_template
+      template << erubis(Rbdock.source_root.join("templates/rbenv/ruby.erb"))           
+      template << erubis(Rbdock.source_root.join("templates/rbenv/bundler.erb"))
+      template << erubis(Rbdock.source_root.join("templates/rbenv/app.erb")) if @app_path
+      template
     end
 
     def rvm_template
-      template_path = Rbdock.source_root.join("templates/#{@image}_base_packages.erb")
-      template = Erubis::Eruby.new(template_path.read, trim: true).result(binding)
-      
-      template_path = Rbdock.source_root.join("templates/rvm_ruby.erb")
-      template << Erubis::Eruby.new(template_path.read, trim: true).result(binding)
-      
-      template_path = Rbdock.source_root.join("templates/rvm_bundler.erb")
-      template << Erubis::Eruby.new(template_path.read, trim: true).result(binding)      
+      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
     end
 
     def self.ruby_versions

data/lib/rbdock/helpers.rb

@@ -1,7 +1,76 @@
 require "pathname"
+require "uri"
 
 module Rbdock
-  def self.source_root    
-    @source_root ||= Pathname.new(File.expand_path('../../../', __FILE__))
-  end
+
+  class << self
+
+    def source_root    
+      @source_root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+    end
+
+    def clone_app_to_local url
+      raise StandardError, "command git not found." if `which git`.empty?
+
+      if local? url
+        if not File.exist?(File.join(source_root, url))
+          raise StandardError, "#{url} is not exit"
+        end
+        
+        return url
+      end
+      
+      if not already_cloned?
+        return exec_clone url
+      end
+
+      if already_cloned? and same_app?(url)
+        return update_app url
+      end
+      
+      return replace_app url
+    end
+
+    def default_app_path
+      '.rbdock_app'
+    end
+    
+    private
+
+    def local? url
+      not URI.regexp =~ url
+    end
+    
+    def exec_clone url
+      if not system("git clone -q #{url} #{default_app_path}")
+        raise StandardError, "clone #{url} is failed. Check url."
+      end
+      STDERR.puts "Clone #{url} to #{default_app_path}/"
+      default_app_path
+    end
+
+    def replace_app url
+      system("rm -fr #{default_app_path}")
+      exec_clone url
+      STDERR.puts "Delete old app and clone #{url} to #{default_app_path}/"
+      default_app_path
+    end
+    
+    def update_app url
+      if not system("cd #{default_app_path}; git pull -q")
+        raise StandardError, "clone #{url} is failed. Check url."
+      end
+      STDERR.puts "Update #{url}"
+      default_app_path
+    end
+
+    def already_cloned?
+      File.exist? default_app_path
+    end
+
+    def same_app? url
+      url == `git --git-dir=.rbdock_app/.git config --get remote.origin.url`.chomp
+    end
+        
+  end  
 end

data/lib/rbdock/version.rb

@@ -1,3 +1,3 @@
 module Rbdock
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/templates/{centos_base_packages.erb → base_package/centos.erb}

@@ -5,6 +5,6 @@ RUN rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.
 RUN yum -y update
 RUN yum install -y make gcc gcc-c++ wget curl git
 RUN yum install -y openssl-devel zlib-devel readline-devel libffi-devel httpd-devel libyaml-devel
-RUN yum install -y bzip2 autoconf automake libtool bison iconv-devel
+RUN yum install -y bzip2 autoconf automake libtool bison iconv-devel ruby-devel
 RUN yum --enablerepo=epel -y install libyaml-devel
 

data/templates/{ubuntu_base_packages.erb → base_package/ubuntu.erb}

@@ -4,6 +4,6 @@ FROM ubuntu
 RUN apt-get update
 RUN apt-get install -y build-essential wget curl git
 RUN apt-get install -y zlib1g-dev libssl-dev libreadline-dev libyaml-dev libxml2-dev libxslt-dev
-RUN apt-get install sqlite3 libsqlite3-dev
+RUN apt-get install -y sqlite3 libsqlite3-dev
 RUN apt-get clean
 

data/templates/default/app.erb

@@ -0,0 +1,9 @@
+# Add application
+RUN mkdir /myapp
+WORKDIR /myapp
+ADD <%= @app_path %>/Gemfile /myapp/Gemfile
+RUN bundle install
+ADD <%= @app_path %> /myapp
+
+ENTRYPOINT ["bash", "-l", "-c"]
+

data/templates/{bundler.erb → default/bundler.erb}

@@ -1,3 +1,4 @@
 # Install bundler
 RUN gem update --system
 RUN gem install bundler --no-rdoc --no-ri
+

data/templates/default/ruby.erb

@@ -0,0 +1,8 @@
+# Install ruby-build
+RUN git clone https://github.com/sstephenson/ruby-build.git .ruby-build
+RUN .ruby-build/install.sh
+RUN rm -fr .ruby-build
+
+# Install ruby-<%=@ruby_versions[0] %>
+RUN ruby-build <%= @ruby_versions[0] %> /usr/local
+

data/templates/rbenv/app.erb

@@ -0,0 +1,8 @@
+# Add Application
+RUN mkdir /myapp
+WORKDIR /myapp
+ADD <%= @app_path %>/Gemfile /myapp/Gemfile
+RUN bash -l -c 'bundle install'
+ADD <%= @app_path %> /myapp
+
+ENTRYPOINT ["bash", "-l", "-c"]

data/templates/rvm/app.erb

@@ -0,0 +1,8 @@
+# Add Application
+RUN mkdir /myapp
+WORKDIR /myapp
+ADD <%= @app_path %>/Gemfile /myapp/Gemfile
+RUN bash -l -c 'bundle install'
+ADD <%= @app_path %> /myapp
+
+ENTRYPOINT ["bash", "-l", "-c"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbdock
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - tcnksm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -128,19 +128,22 @@ files:
 - lib/rbdock.rb
 - lib/rbdock/command.rb
 - lib/rbdock/command/options.rb
-- lib/rbdock/create.rb
+- lib/rbdock/generate.rb
 - lib/rbdock/helpers.rb
 - lib/rbdock/version.rb
 - rbdock.gemspec
 - spec/spec_helper.rb
-- templates/bundler.erb
-- templates/centos_base_packages.erb
-- templates/rbenv_bundler.erb
-- templates/rbenv_ruby.erb
-- templates/ruby.erb
-- templates/rvm_bundler.erb
-- templates/rvm_ruby.erb
-- templates/ubuntu_base_packages.erb
+- templates/base_package/centos.erb
+- templates/base_package/ubuntu.erb
+- templates/default/app.erb
+- templates/default/bundler.erb
+- templates/default/ruby.erb
+- templates/rbenv/app.erb
+- templates/rbenv/bundler.erb
+- templates/rbenv/ruby.erb
+- templates/rvm/app.erb
+- templates/rvm/bundler.erb
+- templates/rvm/ruby.erb
 homepage: https://github.com/tcnksm/rbdock
 licenses:
 - MIT

data/templates/ruby.erb

@@ -1,5 +0,0 @@
-# Install ruby
-RUN wget -P /root/src ftp://ftp.ruby-lang.org/pub/ruby/ruby-<%= @ruby_versions[0] %>.tar.gz
-RUN cd /root/src; tar xvf ruby-<%= @ruby_versions[0] %>.tar.gz
-RUN cd /root/src/ruby-<%= @ruby_versions[0] %>; ./configure --disable-install-doc; make install
-