From 0b0791961f2eaad01a82b149e34274fa4226a868 Mon Sep 17 00:00:00 2001 From: Emese Padanyi Date: Wed, 22 Jul 2020 21:49:16 +0200 Subject: [PATCH 1/2] test --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index cdbe557..887df32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,35 +13,35 @@ script: bundle exec rake ci language: ruby install: bundle install --without=development rvm: -- rbx +#- rbx-2 - 2.2.3 -- jruby-9.1.2.0 +#- jruby-9.1.2.0 - 2.1.8 - 2.3.1 -- ruby-head -- jruby-head +#- ruby-head +#- jruby-head matrix: fast_finish: true allow_failures: - - rvm: jruby-9.1.2.0 + #- 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 + #- 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 # recognized by czmq-ffi-gen's ci-scripts - CZMQ_VERSION=HEAD ZMQ_VERSION=HEAD matrix: - - CELLULOID_BACKPORTED=true + #- CELLULOID_BACKPORTED=true - CELLULOID_BACKPORTED=false - - CELLULOID_BACKPORTED=false CELLULOID_LEAKTEST=true - - CELLULOID_BACKPORTED=false CELLULOID_TASK_CLASS=Threaded - - CELLULOID_BACKPORTED=true CELLULOID_TASK_CLASS=Threaded + #- CELLULOID_BACKPORTED=false CELLULOID_LEAKTEST=true + #- CELLULOID_BACKPORTED=false CELLULOID_TASK_CLASS=Threaded + #- CELLULOID_BACKPORTED=true CELLULOID_TASK_CLASS=Threaded notifications: irc: irc.freenode.org#celluloid slack: From 5166c6533f86645553ece5f62daa5979104c11ff Mon Sep 17 00:00:00 2001 From: Emese Padanyi Date: Mon, 20 Jul 2020 19:21:01 +0200 Subject: [PATCH 2/2] Remove 'culture' submodule --- .gitmodules | 3 -- .rubocop.yml | 85 ++++++++++++++++++++++++++++++++++++++++++- .travis.yml | 4 +- Gemfile | 22 ++++++++++- celluloid-zmq.gemspec | 5 +-- culture | 1 - 6 files changed, 108 insertions(+), 12 deletions(-) delete mode 100644 .gitmodules delete mode 160000 culture diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 7f72185..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "culture"] - path = culture - url = http://github.com/celluloid/culture.git diff --git a/.rubocop.yml b/.rubocop.yml index 39e653a..2bab327 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,2 +1,83 @@ -inherit_from: - - culture/rubocop/rubocop.yml \ No newline at end of file +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 diff --git a/.travis.yml b/.travis.yml index 887df32..73131ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,19 @@ 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) - export BUNDLE_PATH=$HOME/.bundle # bundle caching - ( mkdir -p vendor && cd vendor && git clone --depth 1 https://github.com/paddor/czmq-ffi-gen && cd czmq-ffi-gen && ci-scripts/install-libzmq && ci-scripts/install-libczmq; ) sudo: false + cache: directories: - $HOME/.ccache - $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.2.3 diff --git a/Gemfile b/Gemfile index 2e4054c..1e3e872 100644 --- a/Gemfile +++ b/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 diff --git a/celluloid-zmq.gemspec b/celluloid-zmq.gemspec index 958201d..caac21f 100644 --- a/celluloid-zmq.gemspec +++ b/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 diff --git a/culture b/culture deleted file mode 160000 index befa160..0000000 --- a/culture +++ /dev/null @@ -1 +0,0 @@ -Subproject commit befa16032465eb1513b98f9c8a8f0d2aba5539e9