smalruby-editor 0.3.4-x86-mingw32 → 0.3.5-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 012e88a0bd70877787902816fbb4f79151047e89
-  data.tar.gz: 9d9c64c9a0723d556f51a763788ceffad8fd93dd
+  metadata.gz: 80cec4a4b2957f4f6e16d8457bad8e73b15fd63b
+  data.tar.gz: be2fa77f141227ad5440eb0bfe57ba3c395a7fff
 SHA512:
-  metadata.gz: 8a88c395f14acc2372ec5c9f79840fe1e444549c55df08a38a61c1f43418f5e1643ff55480f204ae756dc6d4fef510cc3e64fda4a3c89b1a64a02d91773662f0
-  data.tar.gz: cafff6a42b7f1f2a96685881af48f160d4bc22e37139f88e3f3b5dd389b833df8be877c74b0d50d908917728297463a21fee44abfa8ab9da07ab814697ae3117
+  metadata.gz: 2482c0b0b895e35cd28b0f7f72a73bf70e07cea33b4afd1acbcafed31b2effface5f38c37cf4d08db9930924337ba0c9c37e883148902e27710438b686f3b2db
+  data.tar.gz: 0cadd6dfe0bce18bcb88db6448b2bd02995e8b83bdf67c13b60f77c86b01826bf75fb83c7d5d6222eee6b16a50bb5a235663672c8cec28b93b63e37749b1da14

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: x86-mingw32
 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
@@ -493,7 +493,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