mcrain 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eab1ae91f7d9e73884273cedd2b581a54d53a80
-  data.tar.gz: 9e853f3952c4d2b718c0d49d42c60cf628199999
+  metadata.gz: 111888ffdf2dde9a910f755931c9f08cd2590102
+  data.tar.gz: 18d629850d3d0cf1bc619f27358312918c507238
 SHA512:
-  metadata.gz: 4a3edb11335ff2b994b90b77134e527dd92584e13f52981f1b2877dfd8d4bbeea38ef2dc0811c170e59f46654cd2e9a93cc8e95e67006026f583708ea540e16b
-  data.tar.gz: 9979c2da2473d65bb7ff9cf2ce9ad325f6392b8262629f176b1f41291d4e651ebd0e99299b05d50481b0bf475cb35e595be462038056c780d74e54a2f18091dc
+  metadata.gz: 8464b124a581aca5c4f6ff14c4d693cc7bf011bd93b88694dd7ac6029b9022cc3c92ae4ded28f2f756c8483172742068ea824d715e0b090a8abc4cdb174b162e
+  data.tar.gz: 86093d944bef21880ff958992a62cfe0120dd851bc1ae54f48efca5a42a1601719be7d0aafb3f9ace5008c6ee0d4ab270fed697708c3b6f4ce7d615ae8c5f3da

data/lib/mcrain/base.rb

@@ -17,6 +17,8 @@ module Mcrain
 
       attr_accessor :container_image, :port
     end
+
+    attr_accessor :skip_reset_after_stop
     def reset
       instance_variables.each do |var|
         instance_variable_set(var, nil)
@@ -52,7 +54,6 @@ module Mcrain
     end
 
     def start
-      reset
       clear_old_container
       run_container
       if block_given?
@@ -143,6 +144,7 @@ module Mcrain
 
     def stop
       LoggerPipe.run(logger, "docker kill #{container_name}", timeout: 10)
+      reset unless skip_reset_after_stop
     end
 
     def logger

data/lib/mcrain/riak.rb

@@ -111,8 +111,7 @@ module Mcrain
     attr_reader :host, :cids, :pb_ports, :uris, :admin_uris
     attr_accessor :automatic_clustering, :cluster_size
 
-    def reset
-      super
+    def setup
       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"))
@@ -126,6 +125,7 @@ module Mcrain
     end
 
     def run_container
+      setup
       logger.debug("cd #{@work_dir.inspect}")
       Dir.chdir(@work_dir) do
         # http://basho.co.jp/riak-quick-start-with-docker/
@@ -152,6 +152,7 @@ module Mcrain
       Dir.chdir(@work_dir) do
         LoggerPipe.run(logger, "#{@prepare_cmd} make stop-cluster")
       end
+      reset unless skip_reset_after_stop
     end
 
   end

data/lib/mcrain/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - akm