baleen 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2a98340a765f5a15844428986e79c7bfc8dba8
-  data.tar.gz: cba1770f9fab05d276391b98675e23f0be82747c
+  metadata.gz: d42b96c06c8175ef15d7ec8240771e4ffa5fd596
+  data.tar.gz: f3e181c9f73e1611e2852a432da6e15239749525
 SHA512:
-  metadata.gz: 6f087c723e6568932a90be20ff641d2f98ac4445e97956339952d20f9d71a89b382ff3e36750b55bf2172fc16078b25731354654f8c38667e33744fe1f9d4fe3
-  data.tar.gz: bcfcf9c4411f3796801a7bdfefff3f74924a670ea1e9a391ce58761509533f200a96be053bd439995cf07420854ab4ac54497666134c8f10266ec274521bc0e7
+  metadata.gz: 24edf1fe8a21baa0e6f7b76716084d163c49b74daff316ab2be3d784722b00a23e12d071e762dea52a8ef1156d61050edff06f3a309b67be8c20d60e984c37d3
+  data.tar.gz: 4dd3b940c44dd665c1150b1fa45798dbf88c9d40bd2088210b1b54e7f166a0a402fa004b8248783ceca97472216698f750e229f69dc66b5b097de1a4bc7ab928

data/Dockerfile

@@ -1 +1,3 @@
-From ubuntu
+From kimh/baleen-server
+Expose 5533:5533
+Entrypoint ["/bin/bash", "-c", "source /etc/profile && baleen-server start --docker_host 172.17.42.1 && tail -f /dev/null"]

data/bin/baleen-server

@@ -33,7 +33,7 @@ class BaleenServerCli < Thor
   option :project_file,  :desc => "Path to project file (baleen.yml)"
   option :dir,           :desc => "Specify the directory for baleen to save temp files, logs, caches, etc."
   option :log_level,     :desc => "Specify log level"
-  option :debug,         :desc => "Run with debug mode. Alias to set log_level to debug", :type => :boolean
+  option :daemon,        :desc => "Running Baleen on background", :type => :boolean
   def start
     if running?
       BL.error "baleen-server is already running"
@@ -47,13 +47,13 @@ class BaleenServerCli < Thor
     dir           = options[:dir]           || default_dir
     project_file  = options[:project_file]  || default_project_file
     ci_port       = options[:ci_port]       || default_ci_port
+    daemon        = options[:daemon]        || default_daemon
     ci            = options[:ci]
-    debug         = options[:debug]
     log_level     = options[:log_level]
 
     config        = Configuration.instance
     config.dir    = dir
-    config.debug  = debug
+    config.debug  = daemon ? false : true
     log_levels    = {"debug" => DEBUG, "info" => INFO, "warn" => WARN, "error" => ERROR}
 
     if log_level.nil?
@@ -70,7 +70,7 @@ class BaleenServerCli < Thor
     BL.notice("  Listening on: #{port}")
     BL.notice("  Docker API: http://#{docker_host}:#{docker_port}").eol
 
-    Process.daemon(true, debug)
+    Process.daemon(true, false) if daemon
     Baleen::Server.new(docker_host, docker_port, port, project_file)
     Baleen::CiServer.run!(docker_host: docker_host, docker_port: docker_port, port: ci_port, log_level: log_level) if ci
 

data/lib/baleen/default.rb

@@ -53,5 +53,9 @@ module Baleen
       Baleen::INFO
     end
 
+    def default_daemon
+      false
+    end
+
   end
 end

data/lib/baleen/version.rb

@@ -1,3 +1,3 @@
 module Baleen
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baleen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kim, Hirokuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler