xing-root 1.0.0.pre.beta.1 → 1.0.0.pre.beta.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/xing/tasks/develop.rb +9 -14
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0ea778f2206c327829ab6dddcbbed73251de5ab6
4
- data.tar.gz: 8f6118b1022c06706841ca8b55e73b577b9030c7
3
+ metadata.gz: aeed2d9a209f86eae052f651a134d8f8f9ea17aa
4
+ data.tar.gz: aeb8bf787b9c95c02ebbfedd8ad97c3044c59083
5
5
  SHA512:
6
- metadata.gz: a098e4b50e1233fbe136a03fbd6060d52262e3bd8c1e002ed46c1366eb988453758f8c5a6d72d154b1bb608f4820643437251a11aaf46381fe26329eb410b82e
7
- data.tar.gz: e276f4002c12040740d6b022e309f0e868d7922be08d60bfffefc3a5f0636adcc8fdc33414f841a70ad90af28e999354754bcabd232b8e3203ecc26e9a5ac0c1
6
+ metadata.gz: 58ba6a978ca001ce267d92737da3492127e573af348525cf3ab586d2f4ce04bf7249eae88e9e3d2cf9c5d7727413d0cc94b04184d7e97773709e37b193260969
7
+ data.tar.gz: 3d10fb492de2067adfb137f6655ff3f994775f63b51402bdc785f24faf4a702655ce73e28526733b8b5afa60f8f6a365b7b2bf654fa68a529b1fdc05dd85b044
@@ -11,21 +11,20 @@ module Xing
11
11
 
12
12
  default_namespace :develop
13
13
 
14
- setting :port_offset
14
+ setting :port_offset, 0
15
15
  setting :reload_server_port
16
16
  setting :rails_server_port
17
17
  setting :mobile_server_port
18
18
  setting :static_server_port
19
19
  setting :manager
20
20
  setting :config_dir, "../frontend"
21
+ setting :output_manager, :tmux
22
+ setting :enabled_services, %i(grunt_watch compass_watch sidekiq static_assets rails_server launch_browser)
21
23
 
22
24
  def get_port_offset
23
25
  if !ENV['PORT_OFFSET'].nil?
24
- ENV['PORT_OFFSET'].to_i.tap do |offset|
25
- puts "Shifting server ports by #{offset}"
26
- end
27
- else
28
- 0
26
+ self.port_offset = Integer(ENV['PORT_OFFSET'])
27
+ puts "Shifting server ports by #{port_offset}"
29
28
  end
30
29
  end
31
30
 
@@ -33,7 +32,7 @@ module Xing
33
32
  begin
34
33
  require 'xing/managers/child'
35
34
  require 'xing/managers/tmux'
36
- if Managers::Tmux.available?
35
+ if output_manager == :tmux and Managers::Tmux.available?
37
36
  Managers::TmuxPane.new
38
37
  else
39
38
  ChildManager.new
@@ -43,14 +42,10 @@ module Xing
43
42
  end
44
43
  end
45
44
 
46
- def default_configuration
47
- @port_offset ||= get_port_offset
48
- @manager ||= choose_output_manager
49
- super
50
- end
51
-
52
45
  def resolve_configuration
53
46
  super
47
+ get_port_offset
48
+ self.manager = choose_output_manager if field_unset?(:manager)
54
49
  self.reload_server_port = DEFAULT_RELOAD_PORT + port_offset if field_unset?(:reload_server_port)
55
50
  self.rails_server_port = DEFAULT_RAILS_PORT + port_offset if field_unset?(:rails_server_port)
56
51
  self.mobile_server_port = DEFAULT_MOBILE_PORT + port_offset if field_unset?(:mobile_server_port)
@@ -137,7 +132,7 @@ module Xing
137
132
  manager.wait_all
138
133
  end
139
134
 
140
- task :startup => [:grunt_watch, :compass_watch, :sidekiq, :static_assets, :rails_server, :launch_browser]
135
+ task :startup => enabled_services
141
136
 
142
137
  task :all => [:startup, :wait]
143
138
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xing-root
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.pre.beta.1
4
+ version: 1.0.0.pre.beta.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Judson Lester
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-02-09 00:00:00.000000000 Z
12
+ date: 2016-02-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: edict
@@ -101,7 +101,7 @@ rdoc_options:
101
101
  - "--main"
102
102
  - doc/README
103
103
  - "--title"
104
- - xing-root-1.0.0.pre.beta.1 Documentation
104
+ - xing-root-1.0.0.pre.beta.2 Documentation
105
105
  require_paths:
106
106
  - lib/
107
107
  required_ruby_version: !ruby/object:Gem::Requirement