einhorn 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTAzM2VhNjlkNDFhM2VlYzE4MjcwMjk3MmI3YzQwMzRkN2MxZmM0Ng==
-  data.tar.gz: !binary |-
-    NTdmZGE0ZDVjMjYyODdlODIyZWM0Y2ExYWE1MWViNmQ3MjEzNWFlMQ==
+SHA1:
+  metadata.gz: 308e0777b30c0d943079572f431fa7892c5bd36e
+  data.tar.gz: 39992f0151df4f7c2c6d9c9455466a9ed0359c5e
 SHA512:
-  metadata.gz: !binary |-
-    ZjgzZGVlZmMwNzZmNGFjMDkzODZlNTJhZjdiNDdjY2I0MmRiOGE0NmQzYjkz
-    Mzc0NjY0MGQ1NWYxMzVkMjI4Nzg0MWNkZGI4MmEwMmIzZWI1MDk5ZDRkZmRh
-    YzBkYTAxMWU1MTVhZWU1ZTM1NDMzMGJlOTgyY2U0MTI5OTM3ZGI=
-  data.tar.gz: !binary |-
-    MjQyZTI4NjI0Njg4NDJmMDBlMWQwYTY4MDU3OWRiZTFhOGJlNDg1YmNkZGJl
-    Y2EzNWMzYjk5NTA3NzU1NzhiN2JmYzUwZjgzYjUxOWU2NTBhM2U0MDA4OTdm
-    Njc4NzQ1MDI0ZWY5Zjk4MDk1NzllODk2NWYzMDE3MTllODM5Njk=
+  metadata.gz: da802c21aa7331fd2dd6597d3940a33622b13a2d4febc2736604ceb5c0b457e6f61930ad705d9f33e99477325b6c5cf2ee08006f5b688b36dc13ad040c5c0112
+  data.tar.gz: b5560a45b9f4de82ae2a9ac424333d63c0aafb93c578421ff100eb51eedac8652ac5cf0191c2189d30fcb8085b898e49d1433a51130f2dacf4103abf5be3f613

data/.travis.yml

@@ -3,4 +3,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1
   - ree

data/lib/einhorn.rb

@@ -129,6 +129,13 @@ module Einhorn
         updated_state[:reloading_for_upgrade] = updated_state.delete(:reloading_for_preload_upgrade)
         message << "upgraded :reloading_for_preload_upgrade to :reloading_for_upgrade"
       end
+
+      # For a period, we created children entries for state_passers,
+      # but we don't want that (in particular, it probably died before
+      # we could setup our SIGCHLD handler
+      if updated_state[:children]
+        updated_state[:children].delete_if {|k, v| v[:type] == :state_passer}
+      end
     end
 
     default = store.default_state

data/lib/einhorn/command.rb

@@ -40,8 +40,6 @@ module Einhorn
       case type = spec[:type]
       when :worker
         Einhorn.log_info("===> Exited worker #{pid.inspect}#{extra}", :upgrade)
-      when :state_passer
-        Einhorn.log_debug("===> Exited state passing process #{pid.inspect}", :upgrade)
       else
         Einhorn.log_error("===> Exited process #{pid.inspect} has unrecgonized type #{type.inspect}: #{spec.inspect}", :upgrade)
       end
@@ -204,9 +202,6 @@ module Einhorn
       fork do
         Einhorn::TransientState.whatami = :state_passer
         Einhorn::State.generation += 1
-        Einhorn::State.children[$$] = {
-          :type => :state_passer
-        }
         read.close
 
         begin

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/test/integration/_lib/helpers/einhorn_helpers.rb

@@ -9,7 +9,11 @@ module Helpers
     end
 
     def default_einhorn_command
-      ['bundle', 'exec', File.expand_path('bin/einhorn', einhorn_code_dir)]
+      cmd = ['bundle', 'exec']
+      cmd << '--keep-file-descriptors' if RUBY_VERSION >= '2.0'
+      cmd << File.expand_path('bin/einhorn', einhorn_code_dir)
+
+      cmd
     end
 
     def with_running_einhorn(cmdline, options = {})

data/test/integration/upgrading.rb

@@ -40,7 +40,7 @@ class UpgradeTests < EinhornIntegrationTestCase
     describe 'when running with --reexec-as' do
       it 'preserves environment variables across restarts' do
         # exec the new einhorn with the same environment:
-        reexec_cmdline = 'env VAR=a bundle exec einhorn'
+        reexec_cmdline = 'env VAR=a bundle exec --keep-file-descriptors einhorn'
 
         with_running_einhorn(%W{einhorn -m manual -b 127.0.0.1:#{@port} --reexec-as=#{reexec_cmdline} -d #{@socket_path} -- ruby #{@server_program} VAR},
                              :env => ENV.to_hash.merge({'VAR' => 'a'})) do |process|
@@ -56,7 +56,7 @@ class UpgradeTests < EinhornIntegrationTestCase
       describe 'without preloading' do
         it 'can update environment variables when the reexec command line says to' do
           # exec the new einhorn with the same environment:
-          reexec_cmdline = 'env VAR=b OINK=b bundle exec einhorn'
+          reexec_cmdline = 'env VAR=b OINK=b bundle exec --keep-file-descriptors einhorn'
 
           with_running_einhorn(%W{einhorn -m manual -b 127.0.0.1:#{@port} --reexec-as=#{reexec_cmdline} -d #{@socket_path} -- ruby #{@server_program} VAR},
                                :env => ENV.to_hash.merge({'VAR' => 'a'})) do |process|
@@ -73,7 +73,7 @@ class UpgradeTests < EinhornIntegrationTestCase
       describe 'with preloading' do
         it 'can update environment variables on preloaded code when the reexec command line says to' do
           # exec the new einhorn with the same environment:
-          reexec_cmdline = 'env VAR=b OINK=b bundle exec einhorn'
+          reexec_cmdline = 'env VAR=b OINK=b bundle exec --keep-file-descriptors einhorn'
 
           with_running_einhorn(%W{einhorn -m manual -p #{@server_program} -b 127.0.0.1:#{@port} --reexec-as=#{reexec_cmdline} -d #{@socket_path} -- ruby #{@server_program} VAR},
                                :env => ENV.to_hash.merge({'VAR' => 'a'})) do |process|
@@ -112,7 +112,7 @@ class UpgradeTests < EinhornIntegrationTestCase
     end
 
     it %{causes an upgrade with --reexec-as to not clobber the new environment} do
-      reexec_cmdline = 'env VAR2=b bundle exec einhorn'
+      reexec_cmdline = 'env VAR2=b bundle exec --keep-file-descriptors einhorn'
       with_running_einhorn(%W{einhorn -m manual -b 127.0.0.1:#{@port} --drop-env-var=VAR1 --drop-env-var=VAR2 -d #{@socket_path} --reexec-as=#{reexec_cmdline} -- ruby #{@server_program} VAR1 VAR2},
                            :env => ENV.to_hash.merge({'VAR1' => 'a', 'VAR2' => 'a'})) do |process|
         wait_for_open_port

data/test/unit/einhorn/client.rb

@@ -15,12 +15,22 @@ class ClientTest < EinhornTestCase
     "---%0A:foo:%0A- ! '%25bar'%0A- ! '%25baz'%0A\n"
   end
 
+  def serialized_2_0
+    "---%0A:foo:%0A- '%25bar'%0A- '%25baz'%0A\n"
+  end
+
+  def serialized_2_1
+    "---%0A:foo:%0A- \"%25bar\"%0A- \"%25baz\"%0A\n"
+  end
+
+  def serialized_options
+    [serialized_1_8, serialized_1_9, serialized_2_0, serialized_2_1]
+  end
+
   describe "when sending a message" do
     it "writes a serialized line" do
       socket = mock
-      socket.expects(:write).with do |write|
-        write == serialized_1_8 || write == serialized_1_9
-      end
+      socket.expects(:write).with {|write| serialized_options.include?(write)}
       Einhorn::Client::Transport.send_message(socket, unserialized_message)
     end
   end
@@ -44,7 +54,7 @@ class ClientTest < EinhornTestCase
   describe "when {de,}serializing a message" do
     it "serializes and escape a message as expected" do
       actual = Einhorn::Client::Transport.serialize_message(unserialized_message)
-      assert(actual == serialized_1_8 || actual == serialized_1_9, "Actual message is #{actual.inspect}")
+      assert(serialized_options.include?(actual), "Actual message is #{actual.inspect}")
     end
 
     it "deserializes and unescape a 1.8-style message as expected" do
@@ -57,6 +67,16 @@ class ClientTest < EinhornTestCase
       assert_equal(unserialized_message, actual)
     end
 
+    it "deserializes and unescapes a 2.0-style message as expected" do
+      actual = Einhorn::Client::Transport.deserialize_message(serialized_2_0)
+      assert_equal(unserialized_message, actual)
+    end
+
+    it "deserializes and unescapes a 2.1-style message as expected" do
+      actual = Einhorn::Client::Transport.deserialize_message(serialized_2_1)
+      assert_equal(unserialized_message, actual)
+    end
+
     it "raises an error when deserializing invalid YAML" do
       invalid_serialized = "-%0A\t-"
       begin

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Greg Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: chalk-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Einhorn makes it easy to run multiple instances of an application server,
@@ -106,8 +106,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTORS
 - Gemfile
 - History.txt
@@ -171,12 +171,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -184,7 +184,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ! 'Einhorn: the language-independent shared socket manager'
+summary: 'Einhorn: the language-independent shared socket manager'
 test_files:
 - test/_lib.rb
 - test/integration/_lib.rb