conjoin 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a81b94f652c67ec99723599b52c64bbe09a85565
-  data.tar.gz: 6a3bd7813ff496ab6c403b285ccfcc4527d18191
+  metadata.gz: ab3826f66dedd3cb8fa351ef77c8b7a424ac941e
+  data.tar.gz: cf17673ce9c6cc7aa8c6041bb59e8436267d7f17
 SHA512:
-  metadata.gz: cbba590883e19b60f00259c61b9e0bbb24e7705995e036d1ae721c48d1f4a99cf40e6169873cd724800a3470eac526569ab73323381c1777c4545c50d8d703f4
-  data.tar.gz: 24787f4fa3fea1715ab83c52e2e1c4920dbc815fa0ee8d48cea486e33a31e8d054c5e1f774fe5819c2bb07d6dc909adf1170a099aff90fb1e5912dcc26f5cf18
+  metadata.gz: 07a2745cf75a7c8e73e8b2fedd404599c26a9b97f945b87fa18d58553d35f9ddaa56c4270d00790984386ab4b5fbead1408f2d7c1b0e449ff26f03c360deed4a
+  data.tar.gz: c4b90b1cd3a0e90023e1f09bd0996db770b7220afd5e1d76b83106decb4001627eeca551276cebbcdf758d80e978c1ba809e455685bf8759f1c81c93e3ba35c9

data/bin/conjoin

@@ -26,16 +26,18 @@ module Conjoin
     end
 
     def server
+      set_env
       system_with_env 'mr-sparkle'
     end
 
     def console
+      set_env
       ENV['CONJOIN_CONSOLE'] = 'true'
       system_with_env "pry -r ./config/console.rb"
     end
 
     def tests
-      ENV['RACK_ENV'] = @env = 'test'
+      @env = ENV['RACK_ENV'] = 'test'
 
       Dir["./test/**/*_test.rb"].each_with_index do |file, i|
         if i != 0
@@ -49,7 +51,7 @@ module Conjoin
     end
 
     def cutest
-      ENV['RACK_ENV'] = @env = 'test'
+      @env = ENV['RACK_ENV'] = 'test'
 
       require "cuba/test"
       require 'awesome_print'
@@ -149,7 +151,7 @@ module Conjoin
     end
 
     def env
-      @env ||= ENV['RACK_ENV'] = argv_string.length > 0 ? argv_string : 'development'
+      @env = ENV['RACK_ENV'] ||= ENV['RACK_ENV'] || 'development'
     end
 
     def argv_string
@@ -166,6 +168,10 @@ module Conjoin
       end
     end
 
+    def set_env
+      @env = ENV['RACK_ENV'] = argv_string if !argv_string.empty?
+    end
+
     def root
       File.expand_path(File.dirname(__FILE__))
     end

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.40"
+  VERSION = "0.0.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba