mcrain 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a827b7fa0a1b8a568712e027c1378e0b1f9ef8a
-  data.tar.gz: 975971865b932bbbaace5fb3b6a1158b564d905b
+  metadata.gz: 25014588e4b0a4b53163edc9897c7d28c728bba7
+  data.tar.gz: e2c8625531480453ffd5a2c06472657523bf1fe1
 SHA512:
-  metadata.gz: eda8ede3198ff5cdd6804e32f5c1cbd2ed9729efd2f5ef5076f6447faf9290aa5fb37854c3c98153339eada33d917acb4f1d7cf42451ebbf0a1ace49c1cff3da
-  data.tar.gz: 2b4ca199e94c665359f1b027ed09d6c1e1af2a25f407f2a128534be6a7332731b68e01c2bb0df4f40db105676b95962c138f2cce3b6e51b01f2e915a0aae9ec8
+  metadata.gz: ff1342b68ede623290b779dd96c37682b2d53ac6630122a99c379304105a5fbdbad3f49bde301ee7ca5d3bd55bf1f30c218fb32d3ecace0cb074296d2705b72f
+  data.tar.gz: 77c4fa278139c172f6fbe30f89a37af6d2feb32b6cedd40368cf270ba0c021f3969b45ee8c38b0b9e7841733e60685204038285c2150b310e2cd3389e01c3f1b

data/exe/mcrain

@@ -4,13 +4,21 @@
 require "mcrain"
 
 action, service, *args  = *ARGV
-verbose = ARGV.include?('-V') || ARGV.include?('--verbose') 
+verbose = ARGV.include?('-V') || ARGV.include?('--verbose')
 if action.nil? || service.nil?
   $stderr.puts(<<MESSAGE)
-#{$PROGRAM_NAME} <action> <target> [n] [-v or --verbose]
-  action: start or stop
-  service: redis, rabbitmq, mysql or riak
-  n: cluster size for riak
+#{$PROGRAM_NAME} <action> <service> [n] [-v or --verbose]
+  actions: start, stop or pull
+
+  start:
+    service: redis, rabbitmq, mysql or riak
+      n: cluster size for riak
+
+  stop:
+    service: redis, rabbitmq, mysql or riak
+
+  pull:
+    service: redis, rabbitmq, mysql, riak or all
 MESSAGE
 
   exit(1)
@@ -25,15 +33,21 @@ begin
   options = {}
   case service
   when "riak" then
-    raise "DOCKER_RIAK_PATH is blank. Set it the path to docker-riak repository." unless ENV['DOCKER_RIAK_PATH']
-    Mcrain::Riak.docker_riak_path = ENV['DOCKER_RIAK_PATH']
     cluster_size = args.shift.to_i
     cluster_size = 1 if cluster_size == 0
     options = {cluster_size: cluster_size, automatic_clustering: cluster_size > 1}
   end
 
-  server = Mcrain.lookup(service.to_sym, options)
-  server.send(action)
+  case action
+  when "start", "stop" then
+    server = Mcrain.lookup(service.to_sym, options)
+    server.send(action)
+  when "pull" then
+    services = (service == "all") ? Mcrain.images.keys : [service]
+    services.map(&:to_sym).map{|s| Mcrain.class_for(s)}.each(&:pull_image)
+  else
+    raise "Unknown action: #{action.inspect}"
+  end
 
   case action
   when "start" then

data/lib/mcrain/container_controller.rb

@@ -12,7 +12,17 @@ module Mcrain
         @server_name ||= self.name.split(/::/).last.underscore.to_sym
       end
 
-      attr_accessor :container_image, :port
+      def container_image
+        @container_image ||= Mcrain.images[server_name]
+      end
+      attr_writer :container_image
+      attr_accessor :port
+
+      def pull_image
+        Timeout.timeout(10.minutes) do
+          LoggerPipe.run(Mcrain.logger, "docker pull #{container_image}")
+        end
+      end
     end
 
     # @return [Docker::Container]

data/lib/mcrain/mysql.rb

@@ -7,7 +7,6 @@ module Mcrain
   class Mysql < Base
     self.server_name = :mysql
 
-    self.container_image = "mysql:5.5"
     self.port = 3306
 
     def client_require

data/lib/mcrain/rabbitmq.rb

@@ -7,7 +7,6 @@ module Mcrain
   class Rabbitmq < Base
     self.server_name = :rabbitmq
 
-    self.container_image = "rabbitmq:3.4.4-management"
     self.port = 15672
 
     def build_docker_options

data/lib/mcrain/redis.rb

@@ -7,7 +7,6 @@ module Mcrain
   class Redis < Base
     self.server_name = :redis
 
-    self.container_image = "redis:2.8.19"
     self.port = 6379
 
     def client_require

data/lib/mcrain/riak.rb

@@ -9,8 +9,6 @@ module Mcrain
 
     self.server_name = :riak
 
-    self.container_image = "hectcastro/riak"
-
     attr_accessor :automatic_clustering
     attr_writer :cluster_size, :backend
     def cluster_size

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/mcrain.rb

@@ -8,6 +8,7 @@ require 'logger_pipe'
 require 'active_support/inflector/inflections'
 require 'active_support/core_ext/class/subclasses'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/numeric/time'
 
 module Mcrain
   class << self
@@ -45,13 +46,17 @@ module Mcrain
       @instances ||= {}
     end
 
-    def pull_images
-      Mcrain::Base.descendants.each do |klass|
-        Timeout.timeout(10.minutes) do
-          LoggerPipe.run(logger, "docker pull #{klass.container_image}")
-        end
-      end
+    DEFAULT_IMAGES = {
+      mysql: "mysql:5.5",
+      redis: "redis:2.8.19",
+      rabbitmq: "rabbitmq:3.4.4-management",
+      riak: "hectcastro/riak",
+    }.freeze
+
+    def images
+      @images ||= DEFAULT_IMAGES.dup
     end
+    attr_writer :images
 
     attr_writer :logger
     def logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe