mcrain 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5629c435f26df6400e933c493df85b13e5a09bd
-  data.tar.gz: 3d63157ba342d42c2021963af422061e072127b4
+  metadata.gz: 32c04fa1f39c69a60b478fbc2b705fff5f9be98a
+  data.tar.gz: 02d9789d7754370e6efefccaf76b3eb318daa733
 SHA512:
-  metadata.gz: 39cfe426a5b1a9b22960e504d1459982c0212d5750250d97d3567ebf11d91785e4ff79b6ab4be37c277ac9150f8670a3fefd73a2d8a632a32c38e37ce483f550
-  data.tar.gz: c6ae5b7cd0e03408ad61f8300a1aafdbd27406e18b00b0e46d5e203b7fdf06411f24d081f5ca81b3312c3f0fce0503c42b5e6835d08281f97d0c1ba092cc7bab
+  metadata.gz: 9ffa2ac30980d2e94509a8dbfda57c957e46ac9235e0ba12d4a20abb226e1cc8006326da3c7c9fa877d380b1af05d75f23fa3e76e6f2abe54b48155221556d44
+  data.tar.gz: 10c42352c1e25d7596dd2a975a189bbac5c862fb199084da4aad286d75190a20393a43620ca5574fce0693b6ca14e049169f1919b5716d50cbc6ae97ce82d15d

data/README.md

@@ -7,13 +7,13 @@ It supports redis, rabbitmq and riak (stand alone node or clustering) currently.
 
 ## Prerequisite
 
-### With boot2docker
+### With docker-machine
 
 - [install docker into Mac](https://docs.docker.com/installation/mac/)
 - [install docker into Windows](https://docs.docker.com/installation/windows/)
 
 
-### Without boot2docker
+### Without docker-machine
 
 The docker daemon must be started with tcp socket option like `-H tcp://0.0.0.0:2375`.
 Because mcrain uses [Docker Remote API](https://docs.docker.com/reference/api/docker_remote_api/).

data/lib/mcrain.rb

@@ -81,7 +81,7 @@ module Mcrain
   end
 
   autoload :Base, 'mcrain/base'
-  autoload :Boot2docker, 'mcrain/boot2docker'
+  autoload :DockerMachine, 'mcrain/docker_machine'
   autoload :ContainerController, 'mcrain/container_controller'
   autoload :ClientProvider, 'mcrain/client_provider'
 

data/lib/mcrain/base.rb

@@ -46,7 +46,7 @@ module Mcrain
 
     def setup
       Timeout.timeout(30) do
-        Boot2docker.setup_docker_options
+        DockerMachine.setup_docker_options
         container.start!
       end
       return container

data/lib/mcrain/{boot2docker.rb → docker_machine.rb}

@@ -10,12 +10,16 @@ require 'net/ssh'
 require 'docker'
 
 module Mcrain
-  module Boot2docker
+  module DockerMachine
 
     class << self
       attr_accessor :certs_dir
+
+      def docker_machine_name
+        ENV['DOCKER_MACHINE_NAME']
+      end
     end
-    self.certs_dir = File.expand_path('.boot2docker/certs/boot2docker-vm', ENV["HOME"])
+    self.certs_dir = File.expand_path('.docker/machine/certs', ENV["HOME"])
 
     module_function
 
@@ -25,10 +29,12 @@ module Mcrain
 
     def preparing_command
       return "" unless used?
-      unless `boot2docker status`.strip == "running"
-        raise "boot2docker is not running. Please `boot2docker start`"
+      name = Mcrain::DockerMachine.docker_machine_name
+      unless `docker-machine status #{name}`.strip.downcase == "running"
+        raise "docker-machine #{name} is not running. Please `docker-machine start #{name}`"
       end
-      exports = `boot2docker shellinit 2>/dev/null`.strip.split(/\n/)
+      exports = `docker-machine env #{name} 2>/dev/null`.strip.split(/\n/).
+        select{|line| line =~ /\Aexport /}
       exports.empty? ? '' : "%s && " % exports.join(" && ")
     end
 
@@ -44,7 +50,7 @@ module Mcrain
     end
 
     def build_docker_options(uri)
-      d = Boot2docker.certs_dir
+      d = DockerMachine.certs_dir
       cert_path = File.join(d, "cert.pem")
       key_path = File.join(d, "key.pem")
       files = {
@@ -61,6 +67,9 @@ module Mcrain
 
     # http://docs.docker.com/reference/api/docker_remote_api/
     # https://github.com/boot2docker/boot2docker#ssh-into-vm
+    #
+    # can't find tcuser in virtualbox...
+    # https://github.com/docker/machine/blob/master/drivers/vmwarefusion/fusion_darwin.go#L28
     def download_files_from_vm(host, files)
       return if files.values.all?{|f| File.readable?(f)}
       files.values.each{|f| FileUtils.mkdir_p(File.dirname(f))}
@@ -75,11 +84,11 @@ module Mcrain
       Net::SCP.start(host, "docker", :password => "tcuser", &block)
     end
 
-    BOOT2DOCKER_DOCKER_HOME = '/home/docker'.freeze
+    DOCKER_MACHINE_DOCKER_HOME = '/home/docker'.freeze
 
     # return temporary dire for 2nd argument of Dir.mktmpdir
     def tmpdir
-      used? ? File.join(BOOT2DOCKER_DOCKER_HOME, 'tmp', Dir.tmpdir) : Dir.tmpdir
+      used? ? File.join(DOCKER_MACHINE_DOCKER_HOME, 'tmp', Dir.tmpdir) : Dir.tmpdir
     end
 
     def ssh_to_vm(&block)
@@ -102,7 +111,7 @@ module Mcrain
 
     def mktmpdir_remote(ssh, &block)
       Dir.mktmpdir do |orig_dir|
-        dir = File.join(BOOT2DOCKER_DOCKER_HOME, 'tmp', orig_dir)
+        dir = File.join(DOCKER_MACHINE_DOCKER_HOME, 'tmp', orig_dir)
         cmd1 = "mkdir -p #{dir}"
         Mcrain.logger.debug(cmd1)
         ssh.exec! cmd1

data/lib/mcrain/riak.rb

@@ -139,7 +139,7 @@ module Mcrain
     end
 
     def setup
-      Boot2docker.setup_docker_options
+      DockerMachine.setup_docker_options
       # setup_nodes(nodes[0, 1]) # primary node
       # setup_nodes(nodes[1..-1])
       nodes.each do |node|

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe
@@ -122,9 +122,9 @@ files:
 - exe/mcrain
 - lib/mcrain.rb
 - lib/mcrain/base.rb
-- lib/mcrain/boot2docker.rb
 - lib/mcrain/client_provider.rb
 - lib/mcrain/container_controller.rb
+- lib/mcrain/docker_machine.rb
 - lib/mcrain/mysql.rb
 - lib/mcrain/rabbitmq.rb
 - lib/mcrain/redis.rb