mcrain 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a06ee8da82a778eea1700f2366af6a025a6456
-  data.tar.gz: 77b113a4873c5acd9d2f6ed093e56092c6648929
+  metadata.gz: 2eab1ae91f7d9e73884273cedd2b581a54d53a80
+  data.tar.gz: 9e853f3952c4d2b718c0d49d42c60cf628199999
 SHA512:
-  metadata.gz: 8af73c32ed5d7e65b217be6cd30c35c72b1e9778812344b04b03b1e0e96957b08dbc0146a23694c62c7d7c34711ee6969b6664ad66732005d438779c5069f1db
-  data.tar.gz: 2895f8d1a5df7e7020045e798badc8290f3d112e3191256b5e4f112ecbd751fe96feae65cda8f8bbdd0e8e32475e2d4ebef1a166ea5ee16c7e19057c41259d8b
+  metadata.gz: 4a3edb11335ff2b994b90b77134e527dd92584e13f52981f1b2877dfd8d4bbeea38ef2dc0811c170e59f46654cd2e9a93cc8e95e67006026f583708ea540e16b
+  data.tar.gz: 9979c2da2473d65bb7ff9cf2ce9ad325f6392b8262629f176b1f41291d4e651ebd0e99299b05d50481b0bf475cb35e595be462038056c780d74e54a2f18091dc

data/lib/mcrain/base.rb

@@ -17,6 +17,11 @@ module Mcrain
 
       attr_accessor :container_image, :port
     end
+    def reset
+      instance_variables.each do |var|
+        instance_variable_set(var, nil)
+      end
+    end
 
     def container_image
       self.class.container_image or raise "No container_image for #{self.class.name}"
@@ -47,6 +52,7 @@ module Mcrain
     end
 
     def start
+      reset
       clear_old_container
       run_container
       if block_given?
@@ -69,8 +75,7 @@ module Mcrain
     end
 
     def run_container
-      s = LoggerPipe.run(logger, build_docker_command, timeout: 10)
-
+      LoggerPipe.run(logger, build_docker_command, timeout: 10)
     end
 
     def build_docker_command
@@ -98,7 +103,7 @@ module Mcrain
         begin
           wait_for_ready
         rescue => e
-          # $stderr.puts "[#{e.class}] #{e.message}"
+          $stderr.puts "[#{e.class}] #{e.message}"
           sleep(1)
           retry
         end
@@ -110,17 +115,32 @@ module Mcrain
     end
 
     def client
-      raise NotImplementedError
+      @client ||= build_client
+    end
+
+    def build_client
+      require client_require
+      yield if block_given?
+      client_class.new(*client_init_args)
     end
 
     def client_require
       raise NotImplementedError
     end
 
-    def client_script
+    def client_class
       raise NotImplementedError
     end
 
+    def client_init_args
+      raise NotImplementedError
+    end
+
+    def client_script
+      client
+      "#{client_class.name}.new(*#{client_init_args.inspect})"
+    end
+
     def stop
       LoggerPipe.run(logger, "docker kill #{container_name}", timeout: 10)
     end

data/lib/mcrain/rabbitmq.rb

@@ -32,22 +32,16 @@ module Mcrain
       "guest"
     end
 
-    def client
-      require client_require
-      @client ||= RabbitMQ::HTTP::Client.new(*build_client_args)
-    end
-
-    def build_client_args
-      ["http://#{host}:#{port}", {username: username, password: password}]
-    end
-
     def client_require
       'rabbitmq/http/client'
     end
 
-    def client_script
-      client
-      "RabbitMQ::HTTP::Client.new(*#{build_client_args.inspect})"
+    def client_class
+      RabbitMQ::HTTP::Client
+    end
+
+    def client_init_args
+      ["http://#{host}:#{port}", {username: username, password: password}]
     end
 
     def wait_for_ready

data/lib/mcrain/redis.rb

@@ -10,22 +10,16 @@ module Mcrain
     self.container_image = "redis:2.8.19"
     self.port = 6379
 
-    def client
-      require client_require
-      @client ||= ::Redis.new(build_client_options)
-    end
-
-    def build_client_options
-      {host: host, port: port}
-    end
-
     def client_require
       'redis'
     end
 
-    def client_script
-      client
-      "Redis.new(#{build_client_options.inspect})"
+    def client_class
+      ::Redis
+    end
+
+    def client_init_args
+      [{host: host, port: port}]
     end
 
     def wait_for_ready

data/lib/mcrain/riak.rb

@@ -20,16 +20,15 @@ module Mcrain
       super
     end
 
-    def client
-      unless @client
-        require client_require
-        build_uris
-        @client = ::Riak::Client.new(build_client_options)
-      end
-      @client
+    def build_client
+      super{ build_uris }
+    end
+
+    def client_class
+      ::Riak::Client
     end
 
-    def build_client_options
+    def client_init_args
       options = {
         nodes: uris.map{|uri| {host: uri.host, pb_port: uri.port} }
       }
@@ -38,18 +37,13 @@ module Mcrain
           options[:authentication] = {user: uri.user, password: uri.password}
         end
       end
-      options
+      [options]
     end
 
     def client_require
       'riak'
     end
 
-    def client_script
-      client
-      "Riak::Client.new(#{build_client_options.inspect})"
-    end
-
     def build_uris
       # https://github.com/hectcastro/docker-riak/blob/develop/bin/test-cluster.sh#L9
 
@@ -82,8 +76,13 @@ module Mcrain
     def wait_for_ready
       c = client
       logger.debug("sending a ping")
-      r = c.ping
-      raise "Ping failure with #{c.inspect}" unless r
+      begin
+        r = c.ping
+        raise "Ping failure with #{c.inspect}" unless r
+      rescue => e
+        logger.debug("[#{e.class.name}] #{e.message} by #{c.inspect}")
+        raise e
+      end
       20.times do |i|
         begin
           logger.debug("get and store ##{i}")
@@ -112,7 +111,8 @@ module Mcrain
     attr_reader :host, :cids, :pb_ports, :uris, :admin_uris
     attr_accessor :automatic_clustering, :cluster_size
 
-    def initialize
+    def reset
+      super
       w = @work_dir = Mcrain::Riak.docker_riak_path
       raise "#{self.class.name}.docker_riak_path is blank. You have to set it to use the class" if w.blank?
       raise "#{w}/Makefile not found" unless File.readable?(File.join(w, "Makefile"))
@@ -129,12 +129,15 @@ module Mcrain
       logger.debug("cd #{@work_dir.inspect}")
       Dir.chdir(@work_dir) do
         # http://basho.co.jp/riak-quick-start-with-docker/
+        #
+        # "Please wait approximately 30 seconds for the cluster to stabilize"
+        #   from https://gist.github.com/agutow/11133143#file-docker3-sh-L12
         LoggerPipe.run(logger, "#{@prepare_cmd} #{build_command}")
         sleep(1)
         20.times do
           begin
             LoggerPipe.run(logger, "#{@prepare_cmd} make test-cluster")
-            sleep(45) # Please wait approximately 30 seconds for the cluster to stabilize
+            sleep(5)
             return
           rescue
             sleep(0.5)

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe