nimbu 0.2.5 → 0.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/nimbu/command/server.rb +13 -5
  2. data/lib/nimbu/version.rb +1 -1
  3. metadata +21 -21
data/lib/nimbu/command/server.rb CHANGED
@@ -18,7 +18,10 @@ class Nimbu::Command::Server < Nimbu::Command::Base
18
18
  if !Nimbu::Auth.read_configuration && !Nimbu::Auth.read_credentials
19
19
  print red(bold("ERROR")), ": this directory does not seem to contain any Nimbu theme or your credentials are not set. \n ==> Run \"", bold { "nimbu init"}, "\" to initialize this directory."
20
20
  else
21
- puts white("\nStarting up Nimbu Server + Compass + HAML compiler...")
21
+ no_haml = args.include?("--no-haml")
22
+ no_compass = args.include?("--no-compass")
23
+
24
+ puts white("\nStarting up Nimbu Server" + (no_compass ? "" : " + Compass Watcher") + (no_haml ? "" : " + HAML Compiler") + "...")
22
25
  puts green(
23
26
  " _ ___ __ \n" +
24
27
  " / | / (_)____ ___ / /_ __ __\n" +
@@ -42,18 +45,22 @@ class Nimbu::Command::Server < Nimbu::Command::Base
42
45
  [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
43
46
  end
44
47
  end
48
+
45
49
  haml_pid = Process.fork do
46
50
  $stdout.reopen(wr2)
47
51
  rd2.close
48
52
  puts "Starting..."
49
53
  HamlWatcher.watch
50
- end
54
+ end unless no_haml
55
+
51
56
  compass_pid = Process.fork do
52
57
  $stdout.reopen(wr3)
53
58
  rd3.close
54
59
  puts "Starting..."
55
60
  Compass::Exec::SubCommandUI.new(["watch","."]).run!
56
- end
61
+ end unless no_compass
62
+
63
+
57
64
  watch_server_pid = Process.fork do
58
65
  trap('INT') { exit }
59
66
  wr1.close
@@ -67,14 +74,15 @@ class Nimbu::Command::Server < Nimbu::Command::Base
67
74
  rd2.each do |line|
68
75
  print magenta("HAML: ") + white(line) + ""
69
76
  end
70
- end
77
+ end unless no_haml
78
+
71
79
  watch_compass_pid = Process.fork do
72
80
  trap('INT') { exit }
73
81
  wr3.close
74
82
  rd3.each do |line|
75
83
  print yellow("COMPASS: ") + white(line) + ""
76
84
  end
77
- end
85
+ end unless no_compass
78
86
 
79
87
  [:INT, :TERM].each do |sig|
80
88
  trap(sig) do
data/lib/nimbu/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Nimbu
2
- VERSION = "0.2.5"
2
+ VERSION = "0.2.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nimbu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.2.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-03-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: term-ansicolor
16
- requirement: &70338780900920 !ruby/object:Gem::Requirement
16
+ requirement: &70366223940960 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.0.5
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70338780900920
24
+ version_requirements: *70366223940960
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rest-client
27
- requirement: &70338780899720 !ruby/object:Gem::Requirement
27
+ requirement: &70366223937320 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.6.1
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70338780899720
35
+ version_requirements: *70366223937320
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: launchy
38
- requirement: &70338780898680 !ruby/object:Gem::Requirement
38
+ requirement: &70366223936600 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.3.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70338780898680
46
+ version_requirements: *70366223936600
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rubyzip
49
- requirement: &70338780897660 !ruby/object:Gem::Requirement
49
+ requirement: &70366223935240 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70338780897660
57
+ version_requirements: *70366223935240
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sinatra
60
- requirement: &70338780896020 !ruby/object:Gem::Requirement
60
+ requirement: &70366223934120 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70338780896020
68
+ version_requirements: *70366223934120
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sinatra-contrib
71
- requirement: &70338780895260 !ruby/object:Gem::Requirement
71
+ requirement: &70366223933180 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70338780895260
79
+ version_requirements: *70366223933180
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: compass
82
- requirement: &70338780894260 !ruby/object:Gem::Requirement
82
+ requirement: &70366223932220 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70338780894260
90
+ version_requirements: *70366223932220
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: haml
93
- requirement: &70338780893000 !ruby/object:Gem::Requirement
93
+ requirement: &70366223931060 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70338780893000
101
+ version_requirements: *70366223931060
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: fssm
104
- requirement: &70338780891960 !ruby/object:Gem::Requirement
104
+ requirement: &70366223930180 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70338780891960
112
+ version_requirements: *70366223930180
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: thin
115
- requirement: &70338780890400 !ruby/object:Gem::Requirement
115
+ requirement: &70366223928900 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70338780890400
123
+ version_requirements: *70366223928900
124
124
  description: Client library and command-line tool to design and manage websites on
125
125
  the Nimbu platform.
126
126
  email: