garlando 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cfa5cad9a4e1f969113e9075792514547862b16
-  data.tar.gz: 32a0b2154abaab7a0bf8bf00003a47a60d9e6832
+  metadata.gz: 7caf226a549137d06499593a0fc968acca5aaa68
+  data.tar.gz: 3be821e59ccd449cd81c43aed644bd920522ce28
 SHA512:
-  metadata.gz: a2b9f94307c4d637bc185c2fca8d8862793871735cfefda4401904e8dd8f94bdbebb4d788b7085f2b1e3553e478961b99683b4c3f750124a884382655e3c413f
-  data.tar.gz: 4f5a43b9b150036dfeadfca2453936cd404907f1b74a0a5dfeeaf3823c236d08b6d09cff699c5f055fde5c4bc755a7eaad638c3400300058705f8ea6e9a92b09
+  metadata.gz: 49a6825840e4cfd913829325a518f6451c64c91de9d09fb58fc23fed89755dbdfcfa353e6f7223b29f6c944df8e6ad08312f36107eeafda03fbd2d77b82c37ea
+  data.tar.gz: 1c07f8f67e3f5503719a87b4fa5a662f1bb142bc3cf4adba047c43e05d62ed42fff98cd48134f2b687ef612ee42316fdac1a56c17952599c1ef091502fa76529

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Yuki MIYAUCHI
+Copyright (c) 2014 miyucy
 
 MIT License
 

data/README.md

@@ -22,7 +22,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/garlando/fork )
+1. Fork it ( http://github.com/miyucy/garlando/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/garlando.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["fistfvck@gmail.com"]
   spec.summary       = %q{asset server}
   spec.description   = %q{asset server}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/miyucy/garlando"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/garlando.rb

@@ -6,12 +6,13 @@ module Garlando
   class Server
     COMMANDS = %i[start restart stop status]
     OPTIONS  = {
-      server: 'thin',
+      env:    'development',
       host:   '0.0.0.0',
+      log:    'log/garlando.log',
+      pid:    'tmp/pids/garlando.pid',
       port:   65501,
-      pid:    'tmp/pids/asset_server.pid',
-      env:    'development',
       pwd:    Dir.pwd,
+      server: 'thin',
     }
 
     def initialize(options={})
@@ -24,7 +25,7 @@ module Garlando
     end
 
     def start
-      abort 'server is already running?' if File.exists? pid_path
+      abort 'server is already running?' if running?
       abort "File could not found (#{env_path})" unless File.exists?(env_path)
 
       Process.daemon nochdir = true
@@ -32,37 +33,36 @@ module Garlando
       File.write pid_path, Process.pid.to_s
       at_exit { File.unlink pid_path }
 
+      reopen
+
       ENV['RACK_ENV'] = @options[:env]
       require env_path
 
-      app = Rack::URLMap.new Rails.application.config.assets[:prefix] => Rails.application.assets
-      srv = Rack::Handler.pick @options[:server]
-      srv.run app, Host: @options[:host], Port: @options[:port]
+      server.run application, Host: @options[:host], Port: @options[:port]
     end
 
-    def stop(aborting = true)
-      unless File.exists?(pid_path)
-        return unless aborting
-        abort 'server is not running'
-      end
+    def stop
+      return abort 'server is not running' unless running?
 
       pid = File.read(pid_path).to_i
       Timeout.timeout(10) do
-        loop do
-          break unless system "ps -p #{pid} > /dev/null"
-          Process.kill :INT, pid
-          sleep 0.5
+        begin
+          while running?
+            Process.kill :INT, pid
+            sleep 0.5
+          end
+        rescue Errno::ESRCH
         end
       end
     end
 
     def restart
-      stop aborting = false
+      stop if running?
       start
     end
 
     def status
-      if File.exists? pid_path
+      if running?
         puts "server is running (#{File.read pid_path})"
       else
         puts 'server is not running'
@@ -71,6 +71,10 @@ module Garlando
 
     private
 
+    def running?
+      File.exists? pid_path
+    end
+
     def pid_path
       File.join @options[:pwd], @options[:pid]
     end
@@ -78,6 +82,23 @@ module Garlando
     def env_path
       File.join @options[:pwd], 'config/environment.rb'
     end
+
+    def reopen
+      file = File.open File.join(@options[:pwd], @options[:log]), 'w+'
+      [STDOUT, STDERR].each { |e| e.reopen file }
+    end
+
+    def server
+      Rack::Handler.get @options[:server]
+    end
+
+    def application
+      Rack::URLMap.new rails.config.assets[:prefix] => rails.assets
+    end
+
+    def rails
+      Rails.application
+    end
   end
 
   class CLI

data/lib/garlando/version.rb

@@ -1,3 +1,3 @@
 module Garlando
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/garlando_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe Garlando::CLI do
   let(:cli) { Garlando::CLI.new }
@@ -18,16 +19,15 @@ describe Garlando::CLI do
   end
 
   describe '#perform' do
+    before { Garlando::Server.any_instance.stub(:call) }
+
     it 'default command' do
-      Garlando::Server.any_instance.stub(:call)
-      # Garlando::Server.stub(new: true)
       cli.perform %w[]
 
       allow_any_instance_of(Garlando::Server).to receive(:call).with(:restart)
     end
 
     it 'send command' do
-      Garlando::Server.any_instance.stub(:call)
       cli.perform %w[foo]
 
       allow_any_instance_of(Garlando::Server).to receive(:call).with(:foo)
@@ -66,4 +66,38 @@ describe Garlando::Server do
       allow(server).to receive(:start)
     end
   end
+
+  describe '#stop' do
+    context 'When server is not running' do
+      before { server.stub running?: false, abort: nil }
+
+      it 'return immediate' do
+        server.stop
+
+        allow(server).to receive(:abort).with('server is not running')
+      end
+    end
+
+    context 'When server is running' do
+      let(:pid) { 1234567890 }
+
+      before do
+        @temp = Tempfile.new 'garlando'
+        @temp.write pid
+        @temp.flush
+
+        server.stub pid_path: @temp.path
+
+        Process.stub(:kill) { raise Errno::ESRCH }
+      end
+
+      after { @temp.close }
+
+      it 'send SIGINT to server' do
+        server.stop
+
+        allow(Process).to receive(:kill).with(:INT, pid)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garlando
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,7 +43,7 @@ files:
 - lib/garlando/version.rb
 - spec/garlando_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/miyucy/garlando
 licenses:
 - MIT
 metadata: {}