mcrain 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e81bfac8bb58900a70df34d2c27e79ad600e2969
-  data.tar.gz: c63154c3050a2e0307f1b872a09ef4c36a9dd946
+  metadata.gz: 7d18a6937f4e154940146b53cfc657da38171ae8
+  data.tar.gz: 99137cb4d00e234344ec07d7a416c53e8bffbc72
 SHA512:
-  metadata.gz: bef8b1dafdcbdb38bee4e91c01a0aa7b3a63662894a1c4eca270a45331cb479f7b4d4ed49bc37a0ed5d16f82b8e26640b97df99d77f4a8479b5fa544fdf32dc7
-  data.tar.gz: fa41ced5e00303e01899172f3ef225aca69569703a3f524d630315010726e73075404e32b0b087f38a96df8e0db453066042524ef3a8ce773cdace9b1874ffc1
+  metadata.gz: 751aca2467b0b5f0745365d794a59680cb44496a0d45acee57271ed8a2f5e65dba1be45ea5e882b253d070efc238d4509bdb9b3d614681e5ce2bca64b3270892
+  data.tar.gz: 75b30cc1936edad4252ee829a1ac9d5f619c922f00e092da5b9bb78ae0f69b864e56ed157779a6545c689a233d18cffcbf724f83f821cd7b9c3f418538a67fb4

data/.circleci/config.yml

@@ -0,0 +1,50 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/mcrain
+
+    ## see https://circleci.com/docs/2.0/executor-types/#machine-executor-overview
+    machine: true
+
+    steps:
+      - checkout
+
+      - run:
+          name: Check docker version
+          command: |
+            set -x
+            docker version
+            docker info
+
+      - run:
+          name: Check ruby version
+          command: |
+            set -x
+            rvm version
+            rvm list
+            ruby -v
+            gem --version
+            gem env
+            bundle --version
+
+      - run:
+          name: Open docker TCP port
+          command: |
+            set -x
+            echo 'DOCKER_OPTS="$DOCKER_OPTS -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock"' | sudo tee -a /etc/default/docker
+            sudo service docker restart
+
+      - run: docker pull mysql:5.5
+      - run: docker pull redis:2.8.19
+      - run: docker pull rabbitmq:3.4.4-management
+      - run: docker pull hectcastro/riak:latest
+
+      - run: bundle install --jobs=4 --path=vendor/bundle
+
+      - run:
+          name: test
+          command: bundle exec rake spec
+          environment:
+            DOCKER_HOST: tcp://127.0.0.1:2375
+
+

data/README.md

@@ -72,6 +72,38 @@ HBase      | N/A                 | `gem 'hbase-jruby'`
 
 ## Usage
 
+### configure images
+
+```ruby
+Mcrain.configure do |config|
+  config.images[:mysql] = "mysql:5.6"
+  config.images[:redis] = "redis:3.2-alpine"
+  # config.images[:rabbitmq] = ...
+  # config.images[:riak] = ...
+  # config.images[:hbase] = ...
+end
+```
+
+Or put `.mcrain.yml` file with following content
+
+```yaml
+---
+images:
+  mysql: "mysql:5.6"
+  redis: "redis:3.2-alpine"
+  # rabbitmq: ...
+  # riak: ...
+  # hbase: ...
+```
+
+and load it by `Mcrain.load_config`:
+
+```ruby
+Mcrain.load_config "/path/to/.mcrain.yml"
+```
+
+`mcrain` command accepts `-c` (`--config`) option to configure images by yaml file, and its default is `.mcrain.yml`.
+
 ### redis in code
 
 ```ruby

data/exe/mcrain

@@ -2,12 +2,16 @@
 # coding: utf-8
 
 require "mcrain"
+require "optparse"
 
-action, service, *args  = *ARGV
-verbose = ARGV.include?('-V') || ARGV.include?('--verbose')
-if action.nil? || service.nil?
-  $stderr.puts(<<MESSAGE)
-#{$PROGRAM_NAME} <action> <service> [n] [-v or --verbose]
+opts = {
+  verbose: false,
+  config_file: ".mcrain.yml"
+}
+
+ARGV.options do |q|
+  q.banner = <<MESSAGE
+#{q.program_name} <action> <service> [n] [options]
   actions: start, stop or pull
 
   start:
@@ -19,16 +23,32 @@ if action.nil? || service.nil?
 
   pull:
     service: redis, rabbitmq, mysql, riak or all
+
+  [options]
 MESSAGE
+  q.on("-c", "--config=file", "Path to mcrain config file, default: .mcrain.yml"){ |v| opts[:config_file] = v }
+  q.on("-V", "--verbose"){ |v| opts[:verbose] = v }
+  q.parse!
+end
 
+action, service, *args  = *ARGV
+if action.nil? || service.nil?
+  $stderr.puts ARGV.options
   exit(1)
 end
 
-unless verbose
+unless opts[:verbose]
   require 'logger'
   Mcrain.logger = Logger.new("/dev/null")
 end
 
+if opts[:config_file] && File.exist?(opts[:config_file])
+  Mcrain.logger.debug "Loading config file from #{opts[:config_file]}"
+  Mcrain.load_config opts[:config_file]
+else
+  Mcrain.logger.debug "Skipped to load config file"
+end
+
 begin
   options = {}
   case service
@@ -64,7 +84,7 @@ begin
       exit(1)
     end
   when "pull" then
-    services = (service == "all") ? Mcrain.images.keys : [service]
+    services = (service == "all") ? Mcrain.configuration.images.keys : [service]
     services.map(&:to_sym).map{|s| Mcrain.class_for(s)}.each(&:pull_image)
   else
     raise "Unknown action: #{action.inspect}"

data/lib/mcrain/configuration.rb

@@ -0,0 +1,33 @@
+require "mcrain"
+require "yaml"
+
+module Mcrain
+  class Configuration
+    DEFAULT_IMAGES = {
+      mysql: "mysql:5.5",
+      redis: "redis:2.8.19",
+      rabbitmq: "rabbitmq:3.4.4-management",
+      riak: "hectcastro/riak",
+      hbase: "nerdammer/hbase:latest",
+    }.freeze
+
+    attr_accessor :images
+
+    def initialize
+      @images = DEFAULT_IMAGES.dup
+    end
+
+    class << self
+      def load_config(file)
+        loaded_config = YAML.load(File.read(file))
+        c = self.new
+        if loaded_config["images"]
+          loaded_config["images"].each do |k,v|
+            c.images[k.to_sym] = v
+          end
+        end
+        c
+      end
+    end
+  end
+end

data/lib/mcrain/container_controller.rb

@@ -13,9 +13,9 @@ module Mcrain
       end
 
       def container_image
-        @container_image ||= Mcrain.images[server_name]
+        Mcrain.configuration.images[server_name]
       end
-      attr_writer :container_image
+
       attr_accessor :port
 
       def pull_image

data/lib/mcrain/riak.rb

@@ -33,7 +33,9 @@ module Mcrain
     class Node
       include ContainerController
 
-      self.container_image = "hectcastro/riak"
+      def self.container_image
+        Mcrain.configuration.images[:riak]
+      end
 
       self.port = 8087 # protocol buffer
       # self.http_port = 8098 # HTTP

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

data/lib/mcrain.rb

@@ -31,18 +31,19 @@ module Mcrain
       class_names[name] = class_name
     end
 
-    DEFAULT_IMAGES = {
-      mysql: "mysql:5.5",
-      redis: "redis:2.8.19",
-      rabbitmq: "rabbitmq:3.4.4-management",
-      riak: "hectcastro/riak",
-      hbase: "nerdammer/hbase:latest",
-    }.freeze
-
-    def images
-      @images ||= DEFAULT_IMAGES.dup
+    def load_config(file)
+      @configuration = Mcrain::Configuration.load_config(file)
+    end
+
+    attr_writer :configuration
+    def configuration
+      @configuration ||= Mcrain::Configuration.new
+    end
+
+    def configure
+      yield configuration
+      configuration
     end
-    attr_writer :images
 
     attr_writer :logger
     def logger
@@ -73,6 +74,7 @@ module Mcrain
   end
 
   autoload :Base, 'mcrain/base'
+  autoload :Configuration, 'mcrain/configuration'
   autoload :DockerMachine, 'mcrain/docker_machine'
   autoload :ContainerController, 'mcrain/container_controller'
   autoload :ClientProvider, 'mcrain/client_provider'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe
@@ -102,6 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -112,11 +113,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - exe/mcrain
 - lib/mcrain.rb
 - lib/mcrain/base.rb
 - lib/mcrain/client_provider.rb
+- lib/mcrain/configuration.rb
 - lib/mcrain/container_controller.rb
 - lib/mcrain/docker_machine.rb
 - lib/mcrain/hbase.rb
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: mcrain supports to run docker container for test.

data/circle.yml

@@ -1,44 +0,0 @@
-machine:
-  ruby:
-    version: 2.2.2
-  services:
-    - docker
-
-dependencies:
-  cache_directories:
-    - "~/docker"
-  pre:
-    - echo 'DOCKER_OPTS="$DOCKER_OPTS -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock"' | sudo tee -a /etc/default/docker
-    - sudo service docker restart
-    - gem install bundler --version '~> 1.10.5'
-    - mkdir -p ~/docker
-    - if [[ -e ~/docker/mysql.tar ]]; then
-        docker load -i ~/docker/mysql.tar;
-      else
-        docker pull mysql:5.5;
-        docker save mysql:5.5 > ~/docker/mysql.tar;
-      fi
-    - if [[ -e ~/docker/redis.tar ]]; then
-        docker load -i ~/docker/redis.tar;
-      else
-        docker pull redis:2.8.19;
-        docker save redis:2.8.19 > ~/docker/redis.tar;
-      fi
-    - if [[ -e ~/docker/rabbitmq.tar ]]; then
-        docker load -i ~/docker/rabbitmq.tar;
-      else
-        docker pull rabbitmq:3.4.4-management;
-        docker save rabbitmq:3.4.4-management > ~/docker/rabbitmq.tar;
-      fi
-    - if [[ -e ~/docker/riak.tar ]]; then
-        docker load -i ~/docker/riak.tar;
-      else
-        docker pull hectcastro/riak:latest;
-        docker save hectcastro/riak:latest > ~/docker/riak.tar;
-      fi
-
-test:
-  override:
-    - bundle exec rake spec:
-        environment:
-          DOCKER_HOST: tcp://127.0.0.1:2375