semian 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37818bb2b8352953c8a3977a29381a812dd6a5aa
-  data.tar.gz: c1cf6be9179e4d21a41d2ff3bc831af8bca7b71f
+  metadata.gz: c2c538a37d4dad10b509ddcc3efa6f80e128644c
+  data.tar.gz: f874bde55c42b7856613ec44faac1001aea1f1ec
 SHA512:
-  metadata.gz: af8ced42836152bebc2f8bebc5a8046c8a69c2cc0bf2c5ce22d286a394d621f140f191df1339a0b90dfe426b7c38e4c3e05f25ced591c008450eb2d3f82a418b
-  data.tar.gz: 309107cb264ad1665103fbcd001134a91491618f6be66d463e2f024892021a80a3f9b7c4f02f97d37e96aca9f31fab6a5a4a7edb402233995c14fb07e4547b15
+  metadata.gz: 9881b1fae08a98cb10541901ee6ef2f06c4dc56c8cb183c3802797c91d9d8c32c10240777c3614892475f73170cf7ad9ef4abcedc0cdd080971c0c4fc09360ce
+  data.tar.gz: 6bfdea4f21cee7be821c2014d5679a71a70a0bd6a23f4b67b148b8c45955bcacd96d04549184aec06f9b375784f14a47ce65a224e3555ecaf10b09938de31bad

data/.travis.yml

@@ -3,11 +3,13 @@ language: ruby
 sudo: true
 
 before_install:
+  - gem install bundler
   - scripts/install_toxiproxy.sh
 
 rvm:
-  - 2.1.1
-  - 2.3.0
+  - '2.1'
+  - '2.2'
+  - '2.3.1'
 
 services:
   - redis-server

data/Gemfile

@@ -6,6 +6,5 @@ group :debug do
 end
 
 group :development, :test do
-  gem 'toxiproxy', github: 'Shopify/toxiproxy-ruby', ref: 'f0c5d0bebca01180e2cfd5234e3d18affefbc670', require: 'toxiproxy'
   gem 'rubocop', '~> 0.34.2'
 end

data/ext/semian/semian.c

@@ -493,7 +493,7 @@ void Init_semian()
   eInternal = rb_const_get(cSemian, rb_intern("InternalError"));
 
   rb_define_alloc_func(cResource, semian_resource_alloc);
-  rb_define_method(cResource, "_initialize", semian_resource_initialize, 4);
+  rb_define_method(cResource, "initialize_semaphore", semian_resource_initialize, 4);
   rb_define_method(cResource, "acquire", semian_resource_acquire, -1);
   rb_define_method(cResource, "count", semian_resource_count, 0);
   rb_define_method(cResource, "semid", semian_resource_id, 0);

data/lib/semian.rb

@@ -1,5 +1,16 @@
+require 'forwardable'
 require 'logger'
+
+require 'semian/version'
 require 'semian/instrumentable'
+require 'semian/platform'
+require 'semian/resource'
+require 'semian/circuit_breaker'
+require 'semian/protected_resource'
+require 'semian/unprotected_resource'
+require 'semian/simple_sliding_window'
+require 'semian/simple_integer'
+require 'semian/simple_state'
 
 #
 # === Overview
@@ -77,8 +88,14 @@ module Semian
   InternalError = Class.new(BaseError)
   OpenCircuitError = Class.new(BaseError)
 
-  def semaphores_enabled?
-    !ENV['SEMIAN_SEMAPHORES_DISABLED'] && Semian.sysv_semaphores_supported?
+  def issue_disabled_semaphores_warning
+    return if defined?(@warning_issued)
+    @warning_issued = true
+    if !sysv_semaphores_supported?
+      logger.info("Semian sysv semaphores are not supported on #{RUBY_PLATFORM} - all operations will no-op")
+    elsif disabled?
+      logger.info("Semian semaphores are disabled, is this what you really want? - all operations will no-op")
+    end
   end
 
   module AdapterError
@@ -151,24 +168,8 @@ module Semian
   end
 end
 
-require 'semian/resource'
-require 'semian/circuit_breaker'
-require 'semian/protected_resource'
-require 'semian/unprotected_resource'
-require 'semian/platform'
-require 'semian/simple_sliding_window'
-require 'semian/simple_integer'
-require 'semian/simple_state'
 if Semian.semaphores_enabled?
   require 'semian/semian'
 else
   Semian::MAX_TICKETS = 0
-  unless Semian.sysv_semaphores_supported?
-    Semian.logger.info("Semian sysv semaphores are not supported on #{RUBY_PLATFORM} - all operations will no-op")
-  end
-
-  if ENV['SEMIAN_SEMAPHORES_DISABLED']
-    Semian.logger.info("Semian semaphores are disabled, is this what you really want? - all operations will no-op")
-  end
 end
-require 'semian/version'

data/lib/semian/adapter.rb

@@ -1,3 +1,5 @@
+require 'semian'
+
 module Semian
   module Adapter
     def semian_identifier

data/lib/semian/mysql2.rb

@@ -1,4 +1,3 @@
-require 'semian'
 require 'semian/adapter'
 require 'mysql2'
 

data/lib/semian/net_http.rb

@@ -1,5 +1,5 @@
-require 'semian'
 require 'semian/adapter'
+require 'net/http'
 
 module Net
   ProtocolError.include(::Semian::AdapterError)

data/lib/semian/platform.rb

@@ -1,6 +1,16 @@
 module Semian
+  extend self
+
   # Determines if Semian supported on the current platform.
-  def self.sysv_semaphores_supported?
+  def sysv_semaphores_supported?
     /linux/.match(RUBY_PLATFORM)
   end
+
+  def semaphores_enabled?
+    !disabled? && sysv_semaphores_supported?
+  end
+
+  def disabled?
+    ENV['SEMIAN_SEMAPHORES_DISABLED']
+  end
 end

data/lib/semian/protected_resource.rb

@@ -1,5 +1,3 @@
-require 'forwardable'
-
 module Semian
   class ProtectedResource
     extend Forwardable

data/lib/semian/redis.rb

@@ -1,4 +1,3 @@
-require 'semian'
 require 'semian/adapter'
 require 'redis'
 

data/lib/semian/resource.rb

@@ -3,7 +3,11 @@ module Semian
     attr_reader :tickets, :name
 
     def initialize(name, tickets:, permissions: 0660, timeout: 0)
-      _initialize(name, tickets, permissions, timeout) if respond_to?(:_initialize)
+      if Semian.semaphores_enabled?
+        initialize_semaphore(name, tickets, permissions, timeout)
+      else
+        Semian.issue_disabled_semaphores_warning
+      end
       @name = name
       @tickets = tickets
     end

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

data/scripts/install_toxiproxy.sh

@@ -7,7 +7,7 @@ fi
 
 if which apt-get > /dev/null; then
   echo "Installing toxiproxy"
-  wget -O /tmp/toxiproxy.deb https://github.com/Shopify/toxiproxy/releases/download/v2.0.0rc1/toxiproxy_2.0.0rc1_amd64.deb
+  wget -O /tmp/toxiproxy.deb https://github.com/Shopify/toxiproxy/releases/download/v2.0.0/toxiproxy_2.0.0_amd64.deb
   sudo dpkg -i /tmp/toxiproxy.deb
   sudo service toxiproxy start
   exit 0

data/semian.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'redis'
   s.add_development_dependency 'thin'
-  s.add_development_dependency 'toxiproxy'
+  s.add_development_dependency 'toxiproxy', '~> 1.0.0'
 end

data/test/circuit_breaker_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestCircuitBreaker < MiniTest::Unit::TestCase
+class TestCircuitBreaker < Minitest::Test
   SomeError = Class.new(StandardError)
 
   def setup

data/test/instrumentation_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestInstrumentation < MiniTest::Unit::TestCase
+class TestInstrumentation < Minitest::Test
   def setup
     Semian.destroy(:testing) if Semian[:testing]
     Semian.register(:testing, tickets: 1, error_threshold: 1, error_timeout: 5, success_threshold: 1)

data/test/mysql2_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestMysql2 < MiniTest::Unit::TestCase
+class TestMysql2 < Minitest::Test
   ERROR_TIMEOUT = 5
   ERROR_THRESHOLD = 1
   SEMIAN_OPTIONS = {

data/test/net_http_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'semian/net_http'
 require 'thin'
 
-class TestNetHTTP < MiniTest::Unit::TestCase
+class TestNetHTTP < Minitest::Test
   class RackServer
     def self.call(env)
       response_code = env['REQUEST_URI'].delete("/")

data/test/redis_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestRedis < MiniTest::Unit::TestCase
+class TestRedis < Minitest::Test
   ERROR_TIMEOUT = 5
   ERROR_THRESHOLD = 1
   SEMIAN_OPTIONS = {

data/test/resource_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestResource < MiniTest::Unit::TestCase
+class TestResource < Minitest::Test
   def setup
     Semian.destroy(:testing)
   rescue

data/test/semian_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestSemian < MiniTest::Unit::TestCase
+class TestSemian < Minitest::Test
   def setup
     Semian.destroy(:testing)
   rescue

data/test/simple_integer_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestSimpleInteger < MiniTest::Unit::TestCase
+class TestSimpleInteger < Minitest::Test
   CLASS = ::Semian::Simple::Integer
 
   def setup

data/test/simple_sliding_window_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestSimpleSlidingWindow < MiniTest::Unit::TestCase
+class TestSimpleSlidingWindow < Minitest::Test
   CLASS = ::Semian::Simple::SlidingWindow
 
   def setup

data/test/simple_state_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestSimpleEnum < MiniTest::Unit::TestCase
+class TestSimpleEnum < Minitest::Test
   CLASS = ::Semian::Simple::State
 
   def setup

data/test/test_helper.rb

@@ -28,6 +28,6 @@ Toxiproxy.populate([
   },
 ])
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   include BackgroundHelper
 end

data/test/unprotected_resource_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class UnprotectedResourceTest < MiniTest::Unit::TestCase
+class UnprotectedResourceTest < Minitest::Test
   def setup
     @resource = Semian::UnprotectedResource.new(:foo)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Scott Francis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -113,16 +113,16 @@ dependencies:
   name: toxiproxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 description: |2
       A Ruby C extention that is used to control access to shared resources
       across process boundaries with SysV semaphores.