Merge pull request #15 from calonso/improve_load_style

calonso · web-flow · commit d89cb59b8bf8 · 2017-01-20T13:44:58.000+01:00
General improvements
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,7 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,14 @@
 language: ruby
 rvm:
-  - "2.2.0"
-  - "2.1.5"
-  - "2.0.0"
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+matrix:
+  include:
+  - rvm: "2.1.10"
+    gemfile: gemfiles/Gemfile-legacy
+  - rvm: "2.0.0"
+    gemfile: gemfiles/Gemfile-legacy
 env: CODECLIMATE_REPO_TOKEN=efdb12c380287a25b2b26362aa710a9b59020122cbe4edecf0d353bf50e0046a
 notifications:
   webhooks:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unrealeased] - [unrealease date]
 
+## 1.0.1 - 2017-01-12
+- **Fixed**: Loading issue when `'forwardable'` wasn't previously required.
+- **Removed**: Version file
+
 ## 1.0.0 - 2016-12-01
 - **Added**: Configurable timeouts for connecting external services.
 - **Removed**: Ruby 1.9.3 support.
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/gemfiles/Gemfile-legacy b/gemfiles/Gemfile-legacy
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem "activesupport", "~> 4.2", group: :test
+
+# Specify your gem's dependencies in ruby-push-notifications.gemspec
+gemspec path: ".."
+
+gem "codeclimate-test-reporter", group: :test, require: nil
diff --git a/lib/ruby-push-notifications.rb b/lib/ruby-push-notifications.rb
@@ -1,4 +1,4 @@
-require 'ruby-push-notifications/version'
+require 'forwardable'
 require 'ruby-push-notifications/notification_results_manager'
 require 'ruby-push-notifications/apns'
 require 'ruby-push-notifications/gcm'
diff --git a/lib/ruby-push-notifications/apns.rb b/lib/ruby-push-notifications/apns.rb
@@ -42,4 +42,3 @@ module RubyPushNotifications::APNS
 require 'ruby-push-notifications/apns/apns_notification'
 require 'ruby-push-notifications/apns/apns_pusher'
 require 'ruby-push-notifications/apns/apns_results'
-
diff --git a/lib/ruby-push-notifications/apns/apns_connection.rb b/lib/ruby-push-notifications/apns/apns_connection.rb
@@ -1,7 +1,5 @@
-
 require 'socket'
 require 'openssl'
-require 'forwardable'
 
 module RubyPushNotifications
   module APNS
diff --git a/lib/ruby-push-notifications/apns/apns_notification.rb b/lib/ruby-push-notifications/apns/apns_notification.rb
@@ -1,4 +1,3 @@
-
 require 'json'
 
 module RubyPushNotifications
diff --git a/lib/ruby-push-notifications/gcm.rb b/lib/ruby-push-notifications/gcm.rb
@@ -4,4 +4,3 @@
 require 'ruby-push-notifications/gcm/gcm_response'
 require 'ruby-push-notifications/gcm/gcm_error'
 require 'ruby-push-notifications/gcm/gcm_result'
-
diff --git a/lib/ruby-push-notifications/version.rb b/lib/ruby-push-notifications/version.rb
diff --git a/ruby-push-notifications.gemspec b/ruby-push-notifications.gemspec
@@ -1,11 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ruby-push-notifications/version'
-
 Gem::Specification.new do |spec|
   spec.name          = "ruby-push-notifications"
-  spec.version       = RubyPushNotifications::VERSION
+  spec.version       = "1.0.1"
   spec.authors       = ['Carlos Alonso']
   spec.email         = ['info@mrcalonso.com']
   spec.summary       = %q{iOS, Android and Windows Phone Push Notifications made easy!}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,109 +1,17 @@
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
+require 'rubygems'
+require 'bundler'
 Bundler.setup
 Bundler.require :defaults, :development
 require 'webmock/rspec'
 
 require 'ruby-push-notifications'
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-    mocks.verify_doubled_constant_names = true
-  end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
-end
 
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
-require 'ruby-push-notifications/apns/apns_notification'
-
 def apns_binary(json, token, id)
   json = JSON.dump(json) if json.is_a?(Hash)
   [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'ruby-push-notifications/version'`
	`1`	`+require 'forwardable'`
`2`	`2`	`require 'ruby-push-notifications/notification_results_manager'`
`3`	`3`	`require 'ruby-push-notifications/apns'`
`4`	`4`	`require 'ruby-push-notifications/gcm'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`require 'json'`
`3`	`2`
`4`	`3`	`module RubyPushNotifications`