Merge da60c87 into 6e4b9ed

.rubocop.yml

@@ -1,2 +1,83 @@
-inherit_from:
-  - culture/rubocop/rubocop.yml
+Lint/HandleExceptions:
+  Enabled: false
+
+Lint/LiteralInCondition:
+  Enabled: false
+
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+Metrics/MethodLength:
+  CountComments: false
+  Max: 20
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/CyclomaticComplexity:
+  Max: 9
+
+Metrics/PerceivedComplexity:
+  Max: 9
+
+Metrics/AbcSize:
+  Max: 20
+
+Style/Documentation:
+  Enabled: false
+
+Style/ModuleFunction:
+  Enabled: false
+
+Style/AndOr:
+  Enabled: true
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/EachWithObject:
+  Enabled: true
+
+Style/InfiniteLoop:
+  Enabled: false
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+Style/AccessModifierIndentation:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/SpaceInsideBlockBraces:
+  Enabled: true
+  EnforcedStyle: space
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: true
+  EnforcedStyle: no_space
+
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Style/GlobalVars:
+  Enabled: false
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false

.travis.yml

@@ -1,4 +1,5 @@
 before_install:
+- gem install bundler -v '1.17.3'
 - PATH="/usr/lib/ccache:$PATH" # enable ccache
 - export LD_LIBRARY_PATH=$HOME/lib # custom libs (for execution)
 - export PKG_CONFIG_PATH=$HOME/lib/pkgconfig # custom libs (for linking)
@@ -11,26 +12,22 @@ cache:
   - $HOME/.bundle
 script: bundle exec rake ci
 language: ruby
-install: bundle install --without=development
+install: bundle _1.17.3_ install --without=development
 rvm:
 - rbx
-- 2.2.3
 - jruby-9.1.2.0
 - 2.1.8
+- 2.2.3
 - 2.3.1
 - ruby-head
 - jruby-head
 matrix:
   fast_finish: true
   allow_failures:
+  - rvm: rbx
   - rvm: jruby-9.1.2.0
-  - rvm: 2.1.8
   - rvm: ruby-head
   - rvm: jruby-head
-  - env: CELLULOID_BACKPORTED=true
-  - env: CELLULOID_BACKPORTED=false CELLULOID_LEAKTEST=true
-  - env: CELLULOID_BACKPORTED=false CELLULOID_TASK_CLASS=Threaded
-  - env: CELLULOID_BACKPORTED=true CELLULOID_TASK_CLASS=Threaded
 env:
   global:
   - NUMBER_OF_PROCESSORS=4 CELLULOID_CONFIG_FILE=.env-ci

Gemfile

@@ -1,2 +1,20 @@
-require File.expand_path("../culture/sync", __FILE__)
-Celluloid::Sync::Gemfile[self]
+source "https://rubygems.org"
+
+gemspec
+
+group :development, :test do
+  gem "benchmark_suite"
+  gem "bundler"
+  gem "coveralls"
+  gem "cztop"
+  gem "dotenv"
+  gem "guard", "=2.13.0"
+  gem "guard-rspec"
+  gem "listen", '=3.0.3'
+  gem "nenv"
+  gem "rubocop"
+  gem "rspec"
+  gem "rspec-retry"
+  gem "rake"
+  gem "transpec"
+end

celluloid-zmq.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../culture/sync", __FILE__)
+require File.expand_path('../lib/celluloid/zmq/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Tony Arcieri"]
@@ -12,13 +12,12 @@ Gem::Specification.new do |gem|
   gem.name          = "celluloid-zmq"
   gem.version       = Celluloid::ZMQ::VERSION
 
-  Celluloid::Sync::Gemspec[gem]
   gem.add_dependency "cztop"
+  gem.add_dependency "celluloid"
 
   # Files
   ignores = File.read(".gitignore").split(/\r?\n/).reject { |f| f =~ /^(#.+|\s*)$/ }.map { |f| Dir[f] }.flatten
   gem.files = (Dir["**/*", ".gitignore"] - ignores).reject { |f| !File.file?(f) }
   gem.test_files = (Dir["spec/**/*", ".gitignore"] - ignores).reject { |f| !File.file?(f) }
-  # gem.executables   = Dir['bin/*'].map { |f| File.basename(f) }
   gem.require_paths = ["lib"]
 end