garlando 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a26124f779ff719156ef89436396438690a13575
-  data.tar.gz: 2180fac73c8d8d20af242246f303c04706c94fc0
+  metadata.gz: c7df483ab31891c11e362aafbfb137628e70d8de
+  data.tar.gz: 3f52745f445511cd001c4833c3cbbe9fa19a8538
 SHA512:
-  metadata.gz: 423a4f94d150de10a56e150aa85961e25ff63bee01be2fd5b8dca4fd09ffa67c81d4b9d52ff2b1e196eff540cfefa5fb7e9dc86ce134e80e4f03d56757328656
-  data.tar.gz: cfaad47b919be25962360e2d060ab031e79e6fb95d5520d0c1cdef09fcb1f11df9a2940f753fb42b0d3caf769e8a8c3e2be1fa07f8a2e2ccf86458b204ee5d9f
+  metadata.gz: 084b5d5d080d188d4fc1d5965f5a3a501e67d2598846db7c7785225f2404583256d54266c15b79ba116ac73b9a29f16702fd66a1383087bfa2630446a65d6224
+  data.tar.gz: 3632eb33e871dfb109035f7640e1dbffabbd805006cf662c326e7170c38ea11965218b9792c2700c8ae2c26effd920530dd462bd916f588072128340a60e292a

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+ruby '2.1.5'
 
 # Specify your gem's dependencies in garlando.gemspec
 gemspec

data/lib/garlando.rb

@@ -1,10 +1,11 @@
 require 'garlando/version'
 require 'optparse'
 require 'timeout'
+require 'net/http'
 
 module Garlando
   class Server
-    COMMANDS = %i[start restart stop status]
+    COMMANDS = %i(start restart stop status)
     OPTIONS  = {
       env:    'development',
       host:   '0.0.0.0',
@@ -12,7 +13,6 @@ module Garlando
       pid:    'tmp/pids/garlando.pid',
       port:   65501,
       pwd:    Dir.pwd,
-      server: 'thin',
     }
 
     def initialize(options={})
@@ -26,17 +26,14 @@ module Garlando
 
     def start
       abort 'server is already running?' if running?
-      abort "File could not found (#{env_path})" unless File.exists?(env_path)
+      abort "File could not found (#{env_path})" unless File.exist?(env_path)
 
       Process.daemon nochdir = true
 
       File.write pid_path, Process.pid.to_s
       at_exit { File.unlink pid_path }
 
-      reopen
-
-      ENV['RACK_ENV'] = @options[:env]
-      require env_path
+      prepare
 
       server.run application, Host: @options[:host], Port: @options[:port]
     end
@@ -90,21 +87,61 @@ module Garlando
     end
 
     def reopen
-      file = File.open log_path, 'w+'
+      file = File.open log_path, 'a'
       [STDOUT, STDERR].each { |e| e.reopen file }
     end
 
     def server
-      Rack::Handler.get @options[:server]
+      Rack::Handler.default
     end
 
     def application
-      Rack::URLMap.new rails.config.assets[:prefix] => rails.assets
+      Rack::Logger.new(Rack::CommonLogger.new(Rack::URLMap.new(rails.config.assets[:prefix] => rails.assets)))
     end
 
     def rails
       Rails.application
     end
+
+    def logger
+      Logger.new log_path
+    end
+
+    def relogging
+      rails.assets.logger = logger
+    end
+
+    def spinup
+      check = lambda do |path|
+        begin
+          Net::HTTP.start(@options[:host], @options[:port]) do |http|
+            http.open_timeout = http.read_timeout = nil
+            http.get path
+            throw :finish
+          end
+        rescue Errno::ECONNREFUSED
+        end
+      end
+      [
+        "#{rails.config.assets[:prefix]}/application.js",
+        "#{rails.config.assets[:prefix]}/application.css",
+      ].each do |_path|
+        Thread.new(_path) do |path|
+          catch(:finish) { loop { check.call path } }
+        end
+      end
+    end
+
+    def prepare
+      reopen
+
+      ENV['RACK_ENV'] = @options[:env]
+      require env_path
+
+      relogging
+
+      spinup
+    end
   end
 
   class CLI
@@ -127,7 +164,6 @@ module Garlando
       options = Server::OPTIONS.dup
 
       opt = OptionParser.new
-      opt.on('-s', '--server SERVER')   { |v| options[:server] = v }
       opt.on('-o', '--host HOST')       { |v| options[:host] = v }
       opt.on('-p', '--port PORT')       { |v| options[:port] = v }
       opt.on('-P', '--pid FILE')        { |v| options[:pid]  = v }

data/lib/garlando/version.rb

@@ -1,3 +1,3 @@
 module Garlando
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/guard/garlando.rb

@@ -7,7 +7,7 @@ module Guard
     end
 
     def start
-      system 'garlando #{@option}'
+      spawn 'garlando #{@option} &'
     end
 
     def stop

data/spec/garlando_spec.rb

@@ -6,31 +6,31 @@ describe Garlando::CLI do
 
   describe '#parse' do
     it 'return command' do
-      commands, _ = cli.parse %w[start]
+      commands, _ = cli.parse %w(start)
 
       expect(commands).to eq ['start']
     end
 
     it 'return options' do
-      _, options = cli.parse %w[-s puma]
+      _, options = cli.parse %w(-o 192.168.0.1)
 
-      expect(options[:server]).to eq 'puma'
+      expect(options[:host]).to eq '192.168.0.1'
     end
   end
 
   describe '#perform' do
-    before { Garlando::Server.any_instance.stub(:call) }
+    before { allow_any_instance_of(Garlando::Server).to receive(:call) }
 
     it 'default command' do
-      cli.perform %w[]
+      expect_any_instance_of(Garlando::Server).to receive(:call).with(:restart)
 
-      allow_any_instance_of(Garlando::Server).to receive(:call).with(:restart)
+      cli.perform []
     end
 
     it 'send command' do
-      cli.perform %w[foo]
+      expect_any_instance_of(Garlando::Server).to receive(:call).with(:foo)
 
-      allow_any_instance_of(Garlando::Server).to receive(:call).with(:foo)
+      cli.perform %w(foo)
     end
   end
 end
@@ -44,37 +44,44 @@ describe Garlando::Server do
     end
 
     it 'otherwise' do
-      server.stub start: nil
-      server.call :start
-
       allow(server).to receive :start
+      expect(server).to receive :start
+
+      server.call :start
     end
   end
 
   describe '#restart' do
-    before { server.stub stop: nil, start: nil }
+    before do
+      allow(server).to receive(:stop)
+      allow(server).to receive(:start)
+      allow(server).to receive(:running?) { true }
+    end
 
     it 'call stop' do
-      server.restart
+      expect(server).to receive(:stop)
 
-      allow(server).to receive(:stop)
+      server.restart
     end
 
     it 'call start' do
-      server.restart
+      expect(server).to receive(:start)
 
-      allow(server).to receive(:start)
+      server.restart
     end
   end
 
   describe '#stop' do
     context 'When server is not running' do
-      before { server.stub running?: false, abort: nil }
+      before do
+        allow(server).to receive(:running?) { false }
+        allow(server).to receive(:abort)
+      end
 
       it 'return immediate' do
-        server.stop
+        expect(server).to receive(:abort).with('server is not running')
 
-        allow(server).to receive(:abort).with('server is not running')
+        server.stop
       end
     end
 
@@ -86,17 +93,16 @@ describe Garlando::Server do
         @temp.write pid
         @temp.flush
 
-        server.stub pid_path: @temp.path
-
-        Process.stub(:kill) { raise Errno::ESRCH }
+        allow(server).to receive(:pid_path) { @temp.path }
+        allow(Process).to receive(:kill) { raise Errno::ESRCH }
       end
 
       after { @temp.close }
 
       it 'send SIGINT to server' do
-        server.stop
+        expect(Process).to receive(:kill).with(:INT, pid)
 
-        allow(Process).to receive(:kill).with(:INT, pid)
+        server.stop
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garlando
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: asset server