smalruby-editor 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bba65985f93de25c7ede4ae1209629ceacfc555
-  data.tar.gz: 2a00938abb121e6fadedd63a90651ed1447ad109
+  metadata.gz: f31eaf9af5535997978a26b3695281bea1b42f0b
+  data.tar.gz: b16de89a95361cfccf5442beff5574bcf5739cd1
 SHA512:
-  metadata.gz: 4907348138e9023b4797aa13d0f4d9da12e65fb50a7365ad605b4747ab0fad5ce3fce2793e40fdc1564f77cfbf9ba620c0c534cedf990ba7892053622eeaf60e
-  data.tar.gz: fb0d6aa2e423b19e1e99e9c0a2c48268cf37ddf5e2429451e751b4c8c0202cd4c3f7e0a93657f757e87ec5758a5894018c0e2bc92fbb5bdb005e0c4850641b8e
+  metadata.gz: 0a98b1fafc323e05da037379b47f980af46bf674c4d2b414c0dd87df077e70aa02e936bfef4aca8446a90856813cb8220e7eb44ad10ec353118d038e54f326a2
+  data.tar.gz: 7e4027a9eed4347b503e2a7911c61b7d2393a13393ff1cafef19ce9831f18a455b4a7158d95002a362c9f44b7df6479dbc438b94e65999f19045566151175ada

data/bin/smalruby-editor

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'pathname'
+require 'socket'
 
 ENV['RAILS_ENV'] = 'standalone'
 ENV['SMALRUBY_EDITOR_HOME'] ||= Pathname('~/.smalruby-editor').expand_path.to_s
@@ -20,9 +21,35 @@ require 'rails/commands/server'
 module Rails
   class Server < ::Rack::Server
     def start
+      if (pid_path = Pathname(options[:pid])).exist?
+        pid = pid_path.read.to_i
+        if SmalrubyEditor.windows?
+          require 'csv'
+          s = `tasklist /FI "IMAGENAME eq ruby.exe" /FO csv`
+          s.force_encoding('CP932')
+          csv = CSV.parse(s)
+          csv.shift # ヘッダを除去
+          pids = csv.map { |row| row[1].to_i }
+          if pids.include?(pid)
+            Process.kill('KILL', pid)
+          end
+          pid_path.unlink
+        else
+          Timeout.timeout(5) do
+            begin
+              while Process.kill(0, pid) > 0
+                Process.kill('TERM', pid)
+                sleep(1)
+              end
+            rescue Errno::ESRCH
+            end
+          end
+        end
+      end
+
       url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
       puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
-      puts "=> smalruby-editor #{SmalrubyEditor::VERSION} starting in #{Rails.env} on #{url}"
+      puts "=> smalruby-editor #{SmalrubyEditor::VERSION} starting in #{Rails.env} on #{url} (#{pid_path})"
       puts "=> Run `smalruby-editor -h` for more startup options"
       trap(:INT) { exit }
       puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
@@ -35,17 +62,7 @@ module Rails
         console.level = Rails.logger.level
 
         Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
-
-        if ActiveRecord::Migrator.needs_migration?
-          ActiveRecord::Migration.verbose = true
-          begin
-            ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths)
-          ensure
-            ActiveRecord::Migration.verbose = false
-          end
-        end
       end
-
       super
     ensure
       # The '-h' option calls exit before @options is set.
@@ -60,7 +77,7 @@ module Rails
         environment:  (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
         daemonize:    false,
         debugger:     false,
-        pid:          Pathname(ENV['SMALRUBY_EDITOR_HOME']).join("tmp/pids/server.pid").to_s,
+        pid:          Pathname(ENV['SMALRUBY_EDITOR_HOME']).join("tmp/pids/server_#{Socket.gethostname}.pid").to_s,
         config:       File.expand_path("config.ru")
       })
     end
@@ -78,27 +95,29 @@ module Rails
       options
     end
     alias_method_chain :parse_options, :start_callback
+
+    def wrapped_app_with_migration
+      if !@wrapped_app
+        wrapped_app_without_migration
+
+        if ActiveRecord::Migrator.needs_migration?
+          ActiveRecord::Migration.verbose = true
+          begin
+            ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths)
+          ensure
+            ActiveRecord::Migration.verbose = false
+          end
+        end
+      end
+      @wrapped_app
+    end
+    alias_method_chain :wrapped_app, :migration
   end
 end
 
 Rails::Server.new.tap do |server|
   require APP_PATH
   Dir.chdir(Rails.application.root)
-  if (pid_path = Pathname(server.default_options[:pid])).exist?
-    if SmalrubyEditor.windows?
-      pid = pid_path.read.to_i
-      require 'csv'
-      s = `tasklist /FI "IMAGENAME eq ruby.exe" /FO csv`
-      s.force_encoding('CP932')
-      csv = CSV.parse(s)
-      csv.shift # ヘッダを除去
-      pids = csv.map { |row| row[1].to_i }
-      if pids.include?(pid)
-        Process.kill('KILL', pid)
-      end
-      pid_path.unlink
-    end
-  end
   server.start
 end
 # rubocop:enable all

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.3.4'
+  VERSION =  '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -507,7 +507,7 @@ files:
 - public/assets/jquery-ui/ui-icons_888888_256x240-ce584ffa171c3ea9a018cf0d7bec65c8.png
 - public/assets/jquery-ui/ui-icons_cd0a0a_256x240-747e96029e8dedcabc224e5f7d1f2ede.png
 - public/assets/loading-e77296be32d066d3e29d3bf9803fa417.gif
-- public/assets/manifest-ffc1bf227b15208b38f552b56f9f8c04.json
+- public/assets/manifest-514520c20d8e98306b1bb2d0437f7575.json
 - public/assets/msg/en_us-a98cc83805d44f5f675fe6eac2c955ec.js
 - public/assets/msg/en_us-a98cc83805d44f5f675fe6eac2c955ec.js.gz
 - public/assets/msg/ja-243b0a55ef1086ef2180af94c422cb5e.js