sidedock 2.0.0.pre.beta2 → 2.0.0.pre.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 773d21903cb8ef30df471830bc42a5ecd7e37ee2
-  data.tar.gz: 4f716d782a3ca186190faccc4d36ea2aa41cb1b4
+  metadata.gz: 522f24ebc97abe8d67bb0c8f564dce746a65e0ba
+  data.tar.gz: 69da47483441aadde251ed0b5a54d095f897d1ac
 SHA512:
-  metadata.gz: 95735346161c7b6af544be9aac823467a8df1483e3b959f6d22d8a4b23539ceda62fb69376b226579f0c0d50337e31891cd5ac9c6983cb37323253d83a9e1008
-  data.tar.gz: 8a766c71866130d1ed196964782ba3fdc2e85dc0718a3c4e612ff70bdf2a3104b6e6a8c3a6e4f008c9bfd2d2c05b6f7b2d93fc7e025ff6a94768d8a4ddac584b
+  metadata.gz: db131b9fa85a3ad209e5f9ec5f6bba3ca3cd0d588a2d958b4201842a22eec21d3cb8db885e52b8218194f0bf38f73bbd9304e7c44744a9efb32529d51a7e19a7
+  data.tar.gz: 35b4f408a803aaf4e20fc462d71d98e6b1175fd3668b0d9a99c5f12e475de308b61393263e22801d4046bae314ed2616713976f5d911289f9baca81c0ef0482b

data/lib/sidedock/base.rb

@@ -5,9 +5,7 @@ module Sidedock
     end
 
     def self.cli
-      args = '--debug' if Sidedock.configuration.debug
-      args ||= ''
-      @@cli ||= DockerCLI.new args
+      @@cli ||= DockerCLI.new ''
     end
   end
 end

data/lib/sidedock/cli/docker_cli.rb

@@ -3,5 +3,9 @@ module Sidedock
     self.program = 'docker'
 
     command_wrapper :create
+
+    def ip
+      '127.0.0.1'
+    end
   end
 end

data/lib/sidedock/cli.rb

@@ -14,7 +14,7 @@ module Sidedock
     def execute(command)
       full_command = "#{program} #{@default_options} #{command}"
       stdout, stderr = command_runner.run full_command
-      raise "`#{command}` failed" if stderr.present?
+      raise "`#{full_command}` failed, stderr: #{stderr}" if stderr.present?
       stdout.strip
     end
 

data/lib/sidedock/container.rb

@@ -36,7 +36,11 @@ module Sidedock
     end
 
     def sh(command)
-      cli.execute "exec -t #{@id} bash -c '#{command}'"
+      cli.execute "exec #{@id} sh -c $'#{escape_single_quotes(command)}'"
+    end
+
+    def escape_single_quotes(string)
+      string.gsub "'", %q(\\\')
     end
 
     def ip

data/lib/sidedock/service.rb

@@ -4,7 +4,7 @@ module Sidedock
   class Service
     attr_reader :container
 
-    delegate :sh, :ports, to: :container
+    delegate :ip, :sh, :ports, to: :container
 
     def self.use(options = {})
       options[:port_mapping] ||= {}
@@ -14,7 +14,7 @@ module Sidedock
         yield new(container)
       end
 
-      remove_image unless options[:keep_image]
+      remove_image if options[:keep_image] == false
     end
 
     protected
@@ -37,7 +37,7 @@ module Sidedock
     end
 
     def self.dockerfile_path
-      "#{directory}/#{dockerfile}"
+      "#{directory}/#{to_s.underscore}/#{dockerfile}"
     end
 
     def self.dockerfile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidedock
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta2
+  version: 2.0.0.pre.beta3
 platform: ruby
 authors:
 - Tim Raasveld