spellbook 0.2.2.2 → 0.2.3

data/History.txt

@@ -1,9 +1,14 @@
-version 0.2.2 - May 6, 2011
+version 0.2.3 - 2011/05/19
+
+  * fix: proxy failed when accessed from other than localhost
+  * fix: do not append --port and --prefix when 'proxy' is unchecked
+
+version 0.2.2 - 2011/05/06
 
   * fix: installation issue
   * fix: did not work with Ruby 1.8
   * fix: proxy failed on other than localhost
 
-version 0.2.0 - Apr 22, 2011
+version 0.2.0 - 2011/04/22
 
   * first release

data/VERSION

@@ -1 +1 @@
-0.2.2.2
+0.2.3

data/lib/spellbook/app.rb

@@ -4,11 +4,15 @@ module SpellBook
     validates_uniqueness_of :name, :port
     validates_numericality_of :port
 
+    def proxy?
+      self.proxy
+    end
+
     def url
-      if self.proxy
+      if self.proxy?
         "/#{self.name}/"
       else
-        "http://localhost:#{self.port}/#{self.name}/"
+        "http://localhost:#{self.port}"
       end
     end
   end

data/lib/spellbook/proxy.rb

@@ -7,7 +7,9 @@ module SpellBook
     end
 
     def rewrite_env(env)
+      env["SERVER_NAME"] = "localhost"
       env["SERVER_PORT"] = @port.to_s
+      env["HTTP_HOST"] = "localhost:#{@port}"
       env
     end
   end

data/lib/spellbook/server.rb

@@ -140,10 +140,13 @@ module SpellBook
     get '/spellbook/apps/:name/start' do
       app = find_app(params[:name])
 
-      cmd = app.command.split + [ 
-        "--port", app.port.to_s,
-        "--prefix", "/#{app.name}"
-      ]
+      cmd = app.command.split
+      if app.proxy?
+        cmd += [ 
+          "--port", app.port.to_s,
+          "--prefix", "/#{app.name}"
+        ]
+      end
       process = ChildProcess.build(*cmd)
 
       Server.processes[app.id] = process
@@ -152,6 +155,7 @@ module SpellBook
       process.io.stdout = tempfile
       process.io.stderr = tempfile
 
+      puts "starting app: #{cmd.join(' ')}"
       process.start
 
       sleep 1

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spellbook
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  - 2
-  version: 0.2.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +09:00
+date: 2011-05-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency