conjoin 0.0.40 → 0.0.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/conjoin +9 -3
  3. data/lib/conjoin/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a81b94f652c67ec99723599b52c64bbe09a85565
4
- data.tar.gz: 6a3bd7813ff496ab6c403b285ccfcc4527d18191
3
+ metadata.gz: ab3826f66dedd3cb8fa351ef77c8b7a424ac941e
4
+ data.tar.gz: cf17673ce9c6cc7aa8c6041bb59e8436267d7f17
5
5
  SHA512:
6
- metadata.gz: cbba590883e19b60f00259c61b9e0bbb24e7705995e036d1ae721c48d1f4a99cf40e6169873cd724800a3470eac526569ab73323381c1777c4545c50d8d703f4
7
- data.tar.gz: 24787f4fa3fea1715ab83c52e2e1c4920dbc815fa0ee8d48cea486e33a31e8d054c5e1f774fe5819c2bb07d6dc909adf1170a099aff90fb1e5912dcc26f5cf18
6
+ metadata.gz: 07a2745cf75a7c8e73e8b2fedd404599c26a9b97f945b87fa18d58553d35f9ddaa56c4270d00790984386ab4b5fbead1408f2d7c1b0e449ff26f03c360deed4a
7
+ data.tar.gz: c4b90b1cd3a0e90023e1f09bd0996db770b7220afd5e1d76b83106decb4001627eeca551276cebbcdf758d80e978c1ba809e455685bf8759f1c81c93e3ba35c9
data/bin/conjoin CHANGED
@@ -26,16 +26,18 @@ module Conjoin
26
26
  end
27
27
 
28
28
  def server
29
+ set_env
29
30
  system_with_env 'mr-sparkle'
30
31
  end
31
32
 
32
33
  def console
34
+ set_env
33
35
  ENV['CONJOIN_CONSOLE'] = 'true'
34
36
  system_with_env "pry -r ./config/console.rb"
35
37
  end
36
38
 
37
39
  def tests
38
- ENV['RACK_ENV'] = @env = 'test'
40
+ @env = ENV['RACK_ENV'] = 'test'
39
41
 
40
42
  Dir["./test/**/*_test.rb"].each_with_index do |file, i|
41
43
  if i != 0
@@ -49,7 +51,7 @@ module Conjoin
49
51
  end
50
52
 
51
53
  def cutest
52
- ENV['RACK_ENV'] = @env = 'test'
54
+ @env = ENV['RACK_ENV'] = 'test'
53
55
 
54
56
  require "cuba/test"
55
57
  require 'awesome_print'
@@ -149,7 +151,7 @@ module Conjoin
149
151
  end
150
152
 
151
153
  def env
152
- @env ||= ENV['RACK_ENV'] = argv_string.length > 0 ? argv_string : 'development'
154
+ @env = ENV['RACK_ENV'] ||= ENV['RACK_ENV'] || 'development'
153
155
  end
154
156
 
155
157
  def argv_string
@@ -166,6 +168,10 @@ module Conjoin
166
168
  end
167
169
  end
168
170
 
171
+ def set_env
172
+ @env = ENV['RACK_ENV'] = argv_string if !argv_string.empty?
173
+ end
174
+
169
175
  def root
170
176
  File.expand_path(File.dirname(__FILE__))
171
177
  end
@@ -1,3 +1,3 @@
1
1
  module Conjoin
2
- VERSION = "0.0.40"
2
+ VERSION = "0.0.41"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjoin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.40
4
+ version: 0.0.41
5
5
  platform: ruby
6
6
  authors:
7
7
  - cj
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-06 00:00:00.000000000 Z
11
+ date: 2014-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cuba