frank 0.1.1 → 0.1.2

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.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.1
1
+ 0.1.2
data/frank.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{frank}
8
- s.version = "0.1.1"
8
+ s.version = "0.1.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["blahed", "nwah"]
12
- s.date = %q{2010-01-16}
12
+ s.date = %q{2010-01-25}
13
13
  s.description = %q{Create/Dump static builds using whatever templating/helper languages you wish}
14
14
  s.email = %q{travis.dunn@thisismedium.com}
15
15
  s.executables = ["frank", "frankout", "frankup"]
data/lib/frank/base.rb CHANGED
@@ -178,8 +178,10 @@ module Frank
178
178
  server.run(builder, :Port => server_settings['port'], :Host => server_settings['hostname']) do
179
179
  trap(:INT) { puts "\n\n-----------------------\n Show's over, fellas.\n\n"; exit }
180
180
  end
181
-
182
- base
181
+
182
+ rescue Errno::EADDRINUSE
183
+ puts " Hold on a second... Frank works alone.\n \033[31mSomething's already using port #{server_settings['port']}\033[0m\n\n"
184
+
183
185
  end
184
186
 
185
187
  end
data/lib/frank/output.rb CHANGED
@@ -31,7 +31,7 @@ module Frank
31
31
  def copy_static
32
32
  puts "Copying over your static content"
33
33
  static_folder = File.join(@proj_dir, @static_folder)
34
- FileUtils.cp_r(static_folder, @output_path)
34
+ FileUtils.cp_r(File.join(static_folder, '/.'), @output_path)
35
35
  end
36
36
 
37
37
  def dump
data/lib/frank/rescue.rb CHANGED
@@ -6,7 +6,7 @@ module Frank
6
6
 
7
7
  @response['Content-Type'] = 'text/html'
8
8
  @response.status = 404
9
- @response.body = tilt_lang(template, 'haml', Object.new, locals = { :request => @env, :params => @request.params })
9
+ @response.body = tilt_lang(template, 'haml', Object.new, locals = { :request => @env, :params => @request.params, :dynamic_folder => @dynamic_folder })
10
10
 
11
11
  log_request('404')
12
12
  end
@@ -13,4 +13,4 @@
13
13
  #wrapper
14
14
  %img{:src=>'/__frank__/frank-404.png'}
15
15
  %h1= "Not Found—"
16
- %p= "Try creating <tt>#{request['REQUEST_PATH'][1..-1]}.haml</tt> in the <tt>views</tt> folder."
16
+ %p= "Try creating <tt>#{request['REQUEST_PATH'][1..-1]}.haml</tt> in the <tt>#{dynamic_folder}</tt> folder."
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: frank
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - blahed
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2010-01-16 00:00:00 -05:00
13
+ date: 2010-01-25 00:00:00 -05:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency