configuration.rb in evrone-ci-worker-0.2.0.pre28

- old
+ new

@@ -17,28 +17,23 @@
         define amqp_url:     nil,
                run:          "docker",
                timeout:      30 * 60,
                logger:       Common::TaggedLogging.new(Logger.new STDOUT),
 
-               tmp_dir_name: "tmp",
-
                workers:          1,
                path_prefix:      nil,
 
                docker: {
-                 remote_dir: "/home/ci",
+                 user: "ci",
+                 password: "ci",
                  init:       %w{ /usr/bin/runsvdir -P /etc/service },
                  image:      "dmexe/ci",
+                 remote_dir: "/home/ci",
+               },
 
-                 ssh: {
-                   host:     nil, # used in tests
-                   port:     nil, # used in tests
-                   user:     "ci",
-                   password: "ci"
-                 },
-
-                 create_options: nil # used in tests
+               local: {
+                 remote_dir: "/tmp/.local_connector"
                }
 
         def timeout
           self[:timeout].to_i
         end
@@ -51,9 +46,17 @@
           self[:path_prefix] || Dir.pwd
         end
 
         def null_logger
           @@null_logger
+        end
+
+        def connector_options
+          self[self.run]
+        end
+
+        def connector_remote_dir
+          connector_options[:remote_dir]
         end
 
       end
     end
   end