Skip to content

Commit 9f90b96

Browse files
mehmeh
committedFeb 1, 2014
lissio: add a builder
1 parent 8237eed commit 9f90b96

File tree

4 files changed

+164
-64
lines changed

4 files changed

+164
-64
lines changed
 

‎bin/lissio

+111-61
Original file line numberDiff line numberDiff line change
@@ -11,71 +11,13 @@ require 'fileutils'
1111
require 'yaml'
1212

1313
require 'lissio'
14-
require 'opal/browser'
1514

1615
class CLI < Thor
17-
desc "start", "start the lissio server"
18-
19-
option :server, type: :string
20-
option :port, type: :numeric
21-
option :host, type: :string
22-
option :require, type: :array, default: []
23-
option :use, type: :array, default: []
24-
option :path, type: :array, default: ['app', 'js', 'opal']
25-
option :static, type: :array, default: ['/css', '/fonts', '/img']
26-
option :index, type: :string
27-
option :debug, type: :boolean
28-
29-
def start
30-
options = self.options.dup
31-
32-
if File.readable? 'lissio.yml'
33-
YAML.load_file('lissio.yml').tap {|opts|
34-
%w[server port host index debug].each {|name|
35-
if opts.has_key?(name) && !options.has_key?(name)
36-
options[name] = opts[name]
37-
end
38-
}
39-
40-
%w[use require path static].each {|name|
41-
if opts.has_key? name
42-
options[name] = Array(opts[name])
43-
end
44-
}
45-
}
46-
end
47-
48-
options[:require].each {|r|
49-
require r
50-
}
51-
52-
options[:use].each {|u|
53-
Opal.use_gem u
54-
}
55-
56-
Rack::Server.start(
57-
Host: options[:host] || '0.0.0.0',
58-
Port: options[:port] || 9292,
59-
server: options[:server],
60-
61-
app: Lissio::Server.new {|s|
62-
options[:path].each {|path|
63-
s.append_path path
64-
}
65-
66-
s.static = options[:static]
16+
desc "new [PATH]", "create a new lissio application"
6717

68-
if index = options[:index]
69-
s.index = index
70-
end
18+
option :adapter, type: :string
19+
option :components, type: :string
7120

72-
if options[:debug]
73-
s.debug = true
74-
end
75-
})
76-
end
77-
78-
desc "new [PATH]", "create a new lissio application"
7921
def new(path = '.')
8022
FileUtils.mkpath path
8123
FileUtils.cd path do
@@ -131,6 +73,114 @@ class CLI < Thor
13173
end
13274
end
13375
end
76+
77+
desc "start", "start the lissio server"
78+
79+
option :server, aliases: '-S', type: :string
80+
option :port, aliases: '-p', type: :numeric
81+
option :host, type: :string
82+
option :main, aliases: '-m', type: :string
83+
option :require, aliases: '-r', type: :array, default: []
84+
option :use, aliases: '-u', type: :array, default: []
85+
option :path, type: :array, default: ['app', 'js', 'opal']
86+
option :static, aliases: '-s', type: :array, default: ['/css', '/fonts', '/img']
87+
option :index, aliases: '-i', type: :string
88+
option :debug, aliases: '-d', type: :boolean
89+
90+
def start
91+
options = prepare
92+
93+
Rack::Server.start(
94+
Host: options[:host] || '0.0.0.0',
95+
Port: options[:port] || 9292,
96+
server: options[:server],
97+
98+
app: Lissio::Server.new {|s|
99+
options[:path].each {|path|
100+
s.append_path path
101+
}
102+
103+
s.static = options[:static]
104+
105+
if main = options[:main]
106+
s.main = main
107+
end
108+
109+
if index = options[:index]
110+
s.index = index
111+
end
112+
113+
if options[:debug]
114+
s.debug = true
115+
end
116+
})
117+
end
118+
119+
desc "build [PATH]", "create a server-less distribution of the application"
120+
121+
option :main, aliases: '-m', type: :string
122+
option :require, aliases: '-r', type: :array, default: []
123+
option :use, aliases: '-u', type: :array, default: []
124+
option :path, type: :array, default: ['app', 'js', 'opal']
125+
option :index, aliases: '-i', type: :string
126+
option :force, aliases: '-f', type: :boolean, default: false
127+
128+
def build(output = 'index.html')
129+
if !options[:force] && File.exists?(output)
130+
raise ArgumentError, "'#{output}' already exists"
131+
end
132+
133+
options = prepare
134+
135+
File.open output, 'w' do |f|
136+
builder = Lissio::Builder.new {|b|
137+
options[:path].each {|path|
138+
b.append_path path
139+
}
140+
141+
if main = options[:main]
142+
b.main = main
143+
end
144+
145+
if index = options[:index]
146+
b.index = index
147+
end
148+
}
149+
150+
f.write builder.build
151+
end
152+
end
153+
154+
private
155+
def prepare
156+
options = self.options.dup
157+
158+
if File.readable? 'lissio.yml'
159+
YAML.load_file('lissio.yml').tap {|opts|
160+
%w[server port host index debug main].each {|name|
161+
if opts.has_key?(name) && !options.has_key?(name)
162+
options[name] = opts[name]
163+
end
164+
}
165+
166+
%w[use require path static].each {|name|
167+
if opts.has_key? name
168+
options[name] = Array(opts[name])
169+
end
170+
}
171+
}
172+
end
173+
174+
options[:require].each {|r|
175+
require r
176+
}
177+
178+
options[:use].each {|u|
179+
Opal.use_gem u
180+
}
181+
182+
options
183+
end
134184
end
135185

136186
CLI.start(ARGV)

‎lib/lissio.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
require 'opal'
2+
require 'opal/browser'
23

34
require 'lissio/server'
5+
require 'lissio/builder'
46

57
Opal.append_path File.expand_path('../../opal', __FILE__)

‎lib/lissio/builder.rb

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
require 'opal/sprockets/environment'
2+
require 'forwardable'
3+
4+
module Lissio
5+
6+
class Builder
7+
extend Forwardable
8+
9+
attr_accessor :debug, :index, :main, :static, :source_maps, :sprockets
10+
def_delegators :@sprockets, :append_path, :use_gem
11+
12+
def initialize(&block)
13+
@sprockets = Opal::Environment.new
14+
@main = 'app'
15+
16+
block.call(self) if block
17+
end
18+
19+
def build
20+
source = if @path
21+
unless File.exist?(@path)
22+
raise "index does not exist: #{@path}"
23+
end
24+
25+
File.read @path
26+
elsif File.exist? 'index.html.erb'
27+
File.read 'index.html.erb'
28+
else
29+
<<-HTML
30+
<!DOCTYPE html>
31+
<html>
32+
<head>
33+
<%= lissio %>
34+
</head>
35+
<body>
36+
</body>
37+
</html>
38+
HTML
39+
end
40+
41+
::ERB.new(source).result binding
42+
end
43+
44+
def lissio(source = main)
45+
"<script>#{@sprockets[source].to_s}</script>"
46+
end
47+
end
48+
49+
end

‎lib/lissio/server.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ def html
6161
end
6262

6363
File.read @path
64-
elsif File.exist? 'index.html'
65-
File.read 'index.html'
6664
elsif File.exist? 'index.html.erb'
6765
File.read 'index.html.erb'
6866
else
@@ -101,8 +99,9 @@ def lissio(source = @server.main)
10199
attr_accessor :debug, :index, :main, :static, :source_maps, :sprockets
102100
def_delegators :@sprockets, :append_path, :use_gem
103101

104-
def initialize(options = {}, &block)
102+
def initialize(&block)
105103
@sprockets = Opal::Environment.new
104+
@main = 'app'
106105

107106
block.call(self) if block
108107
end

0 commit comments

Comments
 (0)
Please sign in to comment.