open-dock 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90f4844b63083092eb249348d863db04035369a
-  data.tar.gz: f9ce5ecc98239076bb0de40231840a4297c6f314
+  metadata.gz: 8340dc1d9ed30ab838684a200392cd8fd4f2140c
+  data.tar.gz: 59be740879ae8b0d20f1922aa50e2e18b836fcbb
 SHA512:
-  metadata.gz: 168c4982f31df7b36926b837d3d8a5145a52e55d625406906fc95b26702a533f06783f8eac248acd580a81e1e83be5d40766a276e1e5e18561b7ee77306185f8
-  data.tar.gz: 390c024ee53331ea76cd60aa263f71437a3c64584633449abb0d7dc5afc8b2557fe41d6f4d35892bdfe77335aca414f7e49c091e19c4d5184cbe767bd0feaab2
+  metadata.gz: 8088a4120fee8f554b61666acf1d07c85baa17e1c6b84dc1c0c70d27a3a5d4fced83285036541dddab319bd7ab6716b349912b2b6477de15cc600a6a8b9a0a21
+  data.tar.gz: 97a4f66849cf3c9d42dc10c3240aafa25a13d01af092c429607f7a97ea1bcf062beb39543332b1d95bce1d5f34de3c1087c3a4ead5aeb099ba98a24c684bdc78

data/README.md

@@ -88,6 +88,8 @@ Helpful commands:
 * `ops list digital_ocean` list all possible parameter values to use in the yml file
 * `ops create example.com` will create your host
 
+By default `user` to connect to host will be 'root' if not configured.
+
 ### Digital Ocean Host
 
 For a Digital Ocean host we can make the following file (ops/hosts/example.com.yml):
@@ -126,7 +128,7 @@ In this file we can configure all containers to run in the host provided in the
 
 ```yml
 www:
-  hostname: lebrijo.com
+  hostname: example.com
   image: jlebrijo/prun
   ports:
     - '2222:22'

data/lib/open-dock/base.rb

@@ -2,15 +2,16 @@ module Ops
   HOSTS_DIR = "hosts"
   CONTAINERS_DIR = "containers"
   PROVIDERS_DIR = "providers"
-
+  DEFAULT_USER = "root"
 
   def self.get_user_for(host_name)
     host_file = "#{HOSTS_DIR}/#{host_name}.yml"
-    begin
+    if File.exist? host_file
       params = YAML.load_file host_file
-      params["user"]
-    rescue
-      raise "Please, create '#{host_file}' configuring your host"
+      if params and params.has_key? "user"
+        return params["user"]
+      end
     end
+    return DEFAULT_USER
   end
 end

data/lib/open-dock/commands/configure_host.rb

@@ -7,7 +7,7 @@ command :configure do |c|
   c.action do |args, options|
     options.default container: 'all'
     host = args[0]
-    user = Docker::DEFAULT_USER
+    user = Ops::DEFAULT_USER
     containers = Docker::containers_for(host)
 
     if options.container == "all"

data/lib/open-dock/commands/ssh_host.rb

@@ -6,7 +6,7 @@ command :ssh do |c|
   c.example "Connects to a container:", 'ops ssh example.com www'
   c.action do |args, options|
     host = args[0]
-    user = Docker::DEFAULT_USER
+    user = Ops::DEFAULT_USER
 
     if args.count == 1
       ssh_port = 22

data/lib/open-dock/docker.rb

@@ -3,7 +3,6 @@ require 'yaml'
 
 module Docker
   SPECIAL_OPTS = ["image", "ports", "command", "post-conditions"]
-  DEFAULT_USER = "root"
 
   def self.containers_for(host_name)
     config_file = "#{Ops::CONTAINERS_DIR}/#{host_name}.yml"

data/lib/open-dock/providers.rb

@@ -7,7 +7,7 @@ class Provider
     begin
       config = YAML.load_file config_file
     rescue
-      raise "Please, create '#{config_file}' file following gem instrunctions"
+      raise "Please, create '#{config_file}' file following gem instructions"
     end
     create_connection config
   end

data/lib/open-dock/version.rb

@@ -1,3 +1,3 @@
 module OpenDock
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Juan Lebrijo