dockerfiroonga 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 668fa5c0f0a0a965b331c2ecd7e1f78d799304c7
-  data.tar.gz: 8fbadf85e6640b6100b57f75594623f61c2afec2
+  metadata.gz: da61263a54fd05b5de7d3a400b3e7a1c4d015897
+  data.tar.gz: 37fb0454621c7044ae5d3e64b636ec00b2dd3757
 SHA512:
-  metadata.gz: c815f2ec578afb006e883c7385effaf839c49863610c76ffb7b7c5ca8b73cb60c58d5cdcca72201c64f260ecd0837aac2a09f520aaf47972be02076044ea065e
-  data.tar.gz: 386764e735099a44001946a0a888c6021fecdea8d8339cbc34629370bf3600f6f5301bcc1b2d135eae5681d02116fc0b10e1c2ae07cf1f66901727346ffc4fc7
+  metadata.gz: 082ef90734103327e6bc408dab0ead06893f468743355bf9638b19a57771d5f642732b238350cf62df604ca0c581fb3b5e1abf8266f1be6b72f180d734cec807
+  data.tar.gz: 7864e34103c6e66d9b98fb4380bcf662c9ef6fa0b524c61e697868a71a327fb85475461b278909ab463debcc7ef280eba3d2e06ccf578896beef8fd7680808a2

data/README.md

@@ -12,7 +12,8 @@ Dockerfile generator for Groonga family.
 
 ### PLATFORM
 
-* `debian:sid` (.tar.gz)
+* `debian[:wheezy]` (APT)
+* `debian:XXX` (.tar.gz)
 * `ubuntu` (PPA)
 * `centos` (yum)
 

data/lib/dockerfiroonga/command.rb

@@ -1,40 +1,83 @@
+require "optparse"
 require "dockerfiroonga/platform"
+require "dockerfiroonga/version"
 
 module Dockerfiroonga
   class Command
-    def self.run(arguments)
-      new(arguments).run
-    end
-
-    def initialize(arguments)
-      if arguments.empty? or /-h|--help/ =~ arguments[0]
-        $stdout.puts(<<-END_OF_USAGE)
-Usage: dockerfiroonga PLATFORM [Xroonga]
+    USAGE = <<-END_OF_USAGE
+Usage: dockerfiroonga [OPTIONS] PLATFORM [Xroonga]
   PLATFORM:
-    * debian:sid (.tar.gz)
+    * debian[:wheezy] (APT)
+    * debian:XXX (.tar.gz)
     * ubuntu (PPA)
     * centos (yum)
   Xroonga:
     * groonga (default)
     * rroonga
-        END_OF_USAGE
-        exit(true)
-      end
+    END_OF_USAGE
+
+    def self.run(arguments)
+      new(arguments).run
+    end
+
+    def initialize(arguments)
+      @options = parse_options(arguments)
+
       @platform_name = arguments[0]
-      @platform = Platform.new(@platform_name)
+      begin
+        @platform = Platform.new(@platform_name)
+      rescue ArgumentError
+        $stderr.puts("This platform is not supported yet: <#{@platform_name}>")
+        $stderr.puts(USAGE)
+        exit(false)
+      end
+
       @_roonga = arguments[1] || "groonga"
       unless @platform.respond_to?("installation_#{@_roonga}")
-        raise ArgumentError, "Not supported yet: <#{@_roonga}>"
+        $stderr.puts("This Xroonga is not supported yet: <#{@_roonga}>")
+        $stderr.puts(USAGE)
+        exit(false)
       end
+
+      @maintainer = @options[:maintainer] ||
+                      "Masafumi Yokoyama <yokoyama@clear-code.com>"
     end
 
     def run
       puts <<-END_OF_FILE
 FROM #{@platform_name}
-MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
+MAINTAINER #{@maintainer}
 #{@platform.__send__("installation_#{@_roonga}")}
 CMD ["groonga", "--version"]
       END_OF_FILE
     end
+
+    private
+    def parse_options(arguments)
+      options = {}
+
+      parser = OptionParser.new(<<-END_OF_BANNER)
+#{USAGE.chomp}
+  OPTIONS:
+      END_OF_BANNER
+
+      parser.version = VERSION
+
+      parser.on("-h", "--help", "Show usage") do |boolean|
+        puts(parser.help)
+        exit(true)
+      end
+      parser.on("--maintainer=NAME", "Set maintainer") do |name|
+        options[:maintainer] = name
+      end
+      parser.parse!(arguments)
+
+      if arguments.empty?
+        puts(parser.help)
+        exit(true)
+      end
+
+      options
+    end
   end
 end

data/lib/dockerfiroonga/platform.rb

@@ -2,14 +2,13 @@ module Dockerfiroonga
   module Platform
     module_function
     def self.new(name)
-      require_name = name.gsub(/:/, "_")
+      os, version = name.split(/:/)
       begin
-        require "dockerfiroonga/platform/#{require_name}"
+        require "dockerfiroonga/platform/#{os}"
       rescue LoadError
         raise ArgumentError, "Invalid name: <#{name}>"
       end
-      class_name = name.split(/:/).collect {|w| w.capitalize}.join
-      const_get(class_name).new
+      const_get(os.capitalize).new(version)
     end
   end
 end

data/lib/dockerfiroonga/platform/base.rb

@@ -1,7 +1,8 @@
 module Dockerfiroonga
   module Platform
     module Base
-      def initialize
+      def initialize(os_version=nil)
+        @os_version = os_version
       end
     end
   end

data/lib/dockerfiroonga/platform/centos.rb

@@ -23,6 +23,44 @@ RUN gem install rdoc
 RUN gem install rroonga
         END_OF_INSTALLATION
       end
+
+      def installation_mroonga
+        case @os_version
+        when "centos5", "5"
+          <<-END_OF_INSTALLATION
+#{installation_groonga}
+#{installation_mroonga_mysql55.chomp}
+          END_OF_INSTALLATION
+        when "centos6", "6"
+          <<-END_OF_INSTALLATION
+#{installation_groonga}
+#{installation_mroonga_mysql_community.chomp}
+          END_OF_INSTALLATION
+        else
+          raise ArgumentError, "Not supported: <#{@os_version}>"
+        end
+      end
+
+      private
+      def installation_mroonga_mysql55
+        <<-END_OF_INSTALLATION
+RUN yum install -y mysql55-mysql-server
+RUN /sbin/service mysql55-mysqld start
+RUN yum install -y mysql55-mroonga
+        END_OF_INSTALLATION
+      end
+
+      def installation_mroonga_mysql_community
+        centos_version = @os_version[-1]
+
+        <<-END_OF_INSTALLATION
+RUN yum install -y http://repo.mysql.com/mysql-community-release-el#{centos_version}-5.noarch.rpm
+RUN yum makecache
+RUN yum install -y mysql-community-server
+RUN /sbin/service mysqld start
+RUN yum install -y mysql-community-mroonga
+        END_OF_INSTALLATION
+      end
     end
   end
 end

data/lib/dockerfiroonga/platform/debian.rb

@@ -0,0 +1,78 @@
+require "dockerfiroonga/platform/base"
+
+module Dockerfiroonga
+  module Platform
+    class Debian
+      include Base
+
+      def initialize(os_version=nil)
+        super
+        @os_version ||= "wheezy"
+      end
+
+      def installation_groonga(version="5.0.0")
+        case @os_version
+        when "wheezy"
+          installation_groonga_wheezy
+        else
+          installation_groonga_source(version)
+        end
+      end
+
+      def installation_rroonga
+        <<-END_OF_INSTALLATION
+#{installation_groonga}
+RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
+RUN export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+RUN apt-get -y install ruby ruby-dev
+RUN gem install rroonga
+        END_OF_INSTALLATION
+      end
+
+      def installation_mroonga(version="5.0.0")
+        case @os_version
+        when "wheezy"
+          <<-END_OF_INSTALLATION
+#{installation_groonga}
+#{installation_mroonga_wheezy.chomp}
+          END_OF_INSTALLATION
+        else
+          raise ArgumentError, "Not supported: <#{@os_version}>"
+        end
+      end
+
+      private
+      def installation_groonga_wheezy
+        codename = "wheezy"
+
+        <<-END_OF_INSTALLATION
+RUN echo "deb http://packages.groonga.org/debian/ #{codename} main" >/etc/apt/sources.list.d/groonga.list
+RUN echo "deb-src http://packages.groonga.org/debian/ #{codename} main" >>/etc/apt/sources.list.d/groonga.list
+RUN apt-get update
+RUN apt-get install -y --allow-unauthenticated groonga-keyring
+RUN apt-get update
+RUN apt-get install -y -V groonga
+        END_OF_INSTALLATION
+      end
+
+      def installation_groonga_source(version)
+        <<-END_OF_INSTALLATION
+RUN apt-get update
+RUN apt-get install -y -V  wget tar build-essential zlib1g-dev liblzo2-dev libmsgpack-dev libzmq-dev libevent-dev libmecab-dev
+RUN wget http://packages.groonga.org/source/groonga/groonga-#{version}.tar.gz
+RUN tar xvzf groonga-#{version}.tar.gz
+RUN cd groonga-#{version}/                            && \
+    ./configure --prefix=/usr/local                   && \
+    make -j$(grep '^processor' /proc/cpuinfo | wc -l) && \
+    make install
+        END_OF_INSTALLATION
+      end
+
+      def installation_mroonga_wheezy
+        <<-END_OF_INSTALLATION
+RUN apt-get install -y -V mysql-server-mroonga
+        END_OF_INSTALLATION
+      end
+    end
+  end
+end

data/lib/dockerfiroonga/version.rb

@@ -1,3 +1,3 @@
 module Dockerfiroonga
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test-command.rb

@@ -5,25 +5,29 @@ class CommandTest < Test::Unit::TestCase
   def setup
     @platform_name = "ubuntu"
     @command = Dockerfiroonga::Command.new([@platform_name])
-    @output = ""
-    io = StringIO.new(@output)
-    $stdout = io
+    @stdout_string = ""
+    @stderr_string = ""
+    stdout_io = StringIO.new(@stdout_string)
+    stderr_io = StringIO.new(@stderr_string)
+    $stdout = stdout_io
+    $stderr = stderr_io
   end
 
   def teardown
     $stdout = STDOUT
+    $stderr = STDERR
   end
 
   def test_run
     @command.run
     assert do
-      @output.each_line.first.start_with?("FROM #{@platform_name}")
+      @stdout_string.lines.first.start_with?("FROM #{@platform_name}")
     end
   end
 
   def test_ubuntu
     @command.run
-    assert_equal(<<-END_OF_FILE, @output)
+    assert_equal(<<-END_OF_FILE, @stdout_string)
 FROM ubuntu
 MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
 RUN apt-get -y install software-properties-common
@@ -39,7 +43,7 @@ CMD ["groonga", "--version"]
   def test_rroonga
     @command = Dockerfiroonga::Command.new([@platform_name, "rroonga"])
     @command.run
-    assert_equal(<<-END_OF_FILE, @output)
+    assert_equal(<<-END_OF_FILE, @stdout_string)
 FROM ubuntu
 MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
 RUN apt-get -y install software-properties-common
@@ -57,6 +61,52 @@ CMD ["groonga", "--version"]
     END_OF_FILE
   end
 
+  class DebianWheezyTest < self
+    def setup
+      super
+      @platform_name = "debian:wheezy"
+    end
+
+    def test_groonga
+      @command = Dockerfiroonga::Command.new([@platform_name, "groonga"])
+      @command.run
+      assert_equal(<<-END_OF_FILE, @stdout_string)
+FROM debian:wheezy
+MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
+RUN echo "deb http://packages.groonga.org/debian/ wheezy main" >/etc/apt/sources.list.d/groonga.list
+RUN echo "deb-src http://packages.groonga.org/debian/ wheezy main" >>/etc/apt/sources.list.d/groonga.list
+RUN apt-get update
+RUN apt-get install -y --allow-unauthenticated groonga-keyring
+RUN apt-get update
+RUN apt-get install -y -V groonga
+
+CMD ["groonga", "--version"]
+      END_OF_FILE
+    end
+
+    def test_rroonga
+      @command = Dockerfiroonga::Command.new([@platform_name, "rroonga"])
+      @command.run
+      assert_equal(<<-END_OF_FILE, @stdout_string)
+FROM debian:wheezy
+MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
+RUN echo "deb http://packages.groonga.org/debian/ wheezy main" >/etc/apt/sources.list.d/groonga.list
+RUN echo "deb-src http://packages.groonga.org/debian/ wheezy main" >>/etc/apt/sources.list.d/groonga.list
+RUN apt-get update
+RUN apt-get install -y --allow-unauthenticated groonga-keyring
+RUN apt-get update
+RUN apt-get install -y -V groonga
+
+RUN apt-get install -y -V libgroonga-dev
+RUN apt-get install -y -V ruby-dev
+RUN apt-get install -y -V build-essential
+RUN gem install rroonga
+
+CMD ["groonga", "--version"]
+      END_OF_FILE
+    end
+  end
+
   class DebianSidTest < self
     def setup
       super
@@ -67,7 +117,7 @@ CMD ["groonga", "--version"]
       @command = Dockerfiroonga::Command.new([@platform_name, "groonga"])
       @command.run
       version = "5.0.0"
-      assert_equal(<<-END_OF_FILE, @output)
+      assert_equal(<<-END_OF_FILE, @stdout_string)
 FROM debian:sid
 MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
 RUN apt-get update
@@ -87,7 +137,7 @@ CMD ["groonga", "--version"]
       @command = Dockerfiroonga::Command.new([@platform_name, "rroonga"])
       @command.run
       version = "5.0.0"
-      assert_equal(<<-END_OF_FILE, @output)
+      assert_equal(<<-END_OF_FILE, @stdout_string)
 FROM debian:sid
 MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
 RUN apt-get update
@@ -117,7 +167,7 @@ CMD ["groonga", "--version"]
     def test_groonga
       @command = Dockerfiroonga::Command.new([@platform_name, "groonga"])
       @command.run
-      assert_equal(<<-END_OF_FILE, @output)
+      assert_equal(<<-END_OF_FILE, @stdout_string)
 FROM centos
 MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
 RUN rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
@@ -131,7 +181,7 @@ CMD ["groonga", "--version"]
     def test_rroonga
       @command = Dockerfiroonga::Command.new([@platform_name, "rroonga"])
       @command.run
-      assert_equal(<<-END_OF_FILE, @output)
+      assert_equal(<<-END_OF_FILE, @stdout_string)
 FROM centos
 MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
 RUN rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
@@ -144,38 +194,106 @@ RUN yum install -y make gcc zlib-devel openssl-devel
 RUN gem install rdoc
 RUN gem install rroonga
 
+CMD ["groonga", "--version"]
+      END_OF_FILE
+    end
+
+    def test_mroonga_centos6
+      @platform_name = "centos:6"
+      @command = Dockerfiroonga::Command.new([@platform_name, "mroonga"])
+      @command.run
+      assert_equal(<<-END_OF_FILE, @stdout_string)
+FROM centos:6
+MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
+RUN rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
+RUN yum makecache
+RUN yum install -y groonga
+
+RUN yum install -y http://repo.mysql.com/mysql-community-release-el6-5.noarch.rpm
+RUN yum makecache
+RUN yum install -y mysql-community-server
+RUN /sbin/service mysqld start
+RUN yum install -y mysql-community-mroonga
+
+CMD ["groonga", "--version"]
+      END_OF_FILE
+    end
+
+    def test_mroonga_centos5
+      @platform_name = "centos:5"
+      @command = Dockerfiroonga::Command.new([@platform_name, "mroonga"])
+      @command.run
+      assert_equal(<<-END_OF_FILE, @stdout_string)
+FROM centos:5
+MAINTAINER Masafumi Yokoyama <yokoyama@clear-code.com>
+RUN rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
+RUN yum makecache
+RUN yum install -y groonga
+
+RUN yum install -y mysql55-mysql-server
+RUN /sbin/service mysql55-mysqld start
+RUN yum install -y mysql55-mroonga
+
 CMD ["groonga", "--version"]
       END_OF_FILE
     end
   end
 
   def test_no_argument
-    @command = Dockerfiroonga::Command.new([])
-    @command.run
+    assert_raise SystemExit do
+      Dockerfiroonga::Command.new([])
+    end
     assert do
-      @output.start_with?("Usage: ")
+      @stdout_string.start_with?("Usage: ")
     end
   end
 
   def test_help_option_short
-    @command = Dockerfiroonga::Command.new(["-h"])
-    @command.run
+    assert_raise SystemExit do
+      Dockerfiroonga::Command.new(["-h"])
+    end
     assert do
-      @output.start_with?("Usage: ")
+      @stdout_string.start_with?("Usage: ")
     end
   end
 
   def test_help_option_long
-    @command = Dockerfiroonga::Command.new(["--help"])
+    assert_raise SystemExit do
+      Dockerfiroonga::Command.new(["--help"])
+    end
+    assert do
+      @stdout_string.start_with?("Usage: ")
+    end
+  end
+
+  def test_maintainer_option
+    @command = Dockerfiroonga::Command.new([
+                                             "--maintainer=Me",
+                                             @platform_name,
+                                           ])
     @command.run
+    assert_equal("MAINTAINER Me\n", @stdout_string.lines[1])
+  end
+
+  def test_not_supported_platform
+    assert_raise SystemExit do
+      Dockerfiroonga::Command.new(["firefox"])
+    end
+    assert_equal("This platform is not supported yet: <firefox>\n",
+                 @stderr_string.lines[0])
     assert do
-      @output.start_with?("Usage: ")
+      @stderr_string.lines[1].start_with?("Usage: ")
     end
   end
 
   def test_not_supported_xroonga
-    assert_raise ArgumentError do
+    assert_raise SystemExit do
       Dockerfiroonga::Command.new([@platform_name, "xxxroonga"])
     end
+    assert_equal("This Xroonga is not supported yet: <xxxroonga>\n",
+                 @stderr_string.lines[0])
+    assert do
+      @stderr_string.lines[1].start_with?("Usage: ")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfiroonga
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -86,7 +86,7 @@ files:
 - lib/dockerfiroonga/platform.rb
 - lib/dockerfiroonga/platform/base.rb
 - lib/dockerfiroonga/platform/centos.rb
-- lib/dockerfiroonga/platform/debian_sid.rb
+- lib/dockerfiroonga/platform/debian.rb
 - lib/dockerfiroonga/platform/ubuntu.rb
 - lib/dockerfiroonga/version.rb
 - test/run-test.rb
@@ -111,11 +111,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dockerfile generator for Groonga family.
 test_files:
 - test/run-test.rb
 - test/test-command.rb
-has_rdoc: 

data/lib/dockerfiroonga/platform/debian_sid.rb

@@ -1,32 +0,0 @@
-require "dockerfiroonga/platform/base"
-
-module Dockerfiroonga
-  module Platform
-    class DebianSid
-      include Base
-
-      def installation_groonga(version="5.0.0")
-        <<-END_OF_INSTALLATION
-RUN apt-get update
-RUN apt-get install -y -V  wget tar build-essential zlib1g-dev liblzo2-dev libmsgpack-dev libzmq-dev libevent-dev libmecab-dev
-RUN wget http://packages.groonga.org/source/groonga/groonga-#{version}.tar.gz
-RUN tar xvzf groonga-#{version}.tar.gz
-RUN cd groonga-#{version}/                            && \
-    ./configure --prefix=/usr/local                   && \
-    make -j$(grep '^processor' /proc/cpuinfo | wc -l) && \
-    make install
-        END_OF_INSTALLATION
-      end
-
-      def installation_rroonga
-        <<-END_OF_INSTALLATION
-#{installation_groonga}
-RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-RUN export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-RUN apt-get -y install ruby ruby-dev
-RUN gem install rroonga
-        END_OF_INSTALLATION
-      end
-    end
-  end
-end