clockwork-test 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04841b06996c44694737b6b20bcde77b09d1bded
-  data.tar.gz: 3d4bc58d1d60f70e62b18a39d9cd67dee6d33f49
+  metadata.gz: ae0cfddfe422335668da047a76e3f000bc2d3c47
+  data.tar.gz: 293e4428ae8f1da04648211915b7c7a83b085085
 SHA512:
-  metadata.gz: 4d9d5c7e1ce1698d11c491913bff94caf84d99127de21f3f808fcd36acd210be63e5633cf089249060309968790683d5528ce0c662b95116bcccbc6911504f24
-  data.tar.gz: abff8383bad36eb141262c93c2eff9fa49160a332dbb5ad78d12ab4d7a6abcb4165103ec42dc5808366c6c19bb443b05df4ba1934529c47f704d3052a31c5783
+  metadata.gz: eb9a8a9c169b32f0923db5ade9e50a0386593b741eeb8a8bce61ec78472109faf7fc6a4afe29079ba34598ee56461b44e579641f539c5da69e09cfff445eef07
+  data.tar.gz: 4d8e20a57c3687a2ca5f2141286ce62d941cf3309803f560819f7a831965f493c70564cc4e947c60ffc71da212ffbce5a9f0acd3212d4279d056d296193b18be

data/.travis.yml

@@ -2,13 +2,17 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
 script:
   - bundle exec rspec
 matrix:
   allow_failures:
     - rvm: ruby-head
+gemfile:
+  - gemfiles/clockwork_1_3_1.gemfile
+  - gemfiles/clockwork_2_0_0.gemfile
+  - gemfiles/clockwork_2_0_1.gemfile
+  - gemfiles/clockwork_2_0_2.gemfile

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "clockwork-1-3-1" do
+  gem "clockwork", "1.3.1"
+end
+
+appraise "clockwork-2-0-0" do
+  gem "clockwork", "2.0.0"
+end
+
+appraise "clockwork-2-0-1" do
+  gem "clockwork", "2.0.1"
+end
+
+appraise "clockwork-2-0-2" do
+  gem "clockwork", "2.0.2"
+end

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## Current release (in development)
 
+## 0.2.0
+
+* Refactor custom matcher to remove repeated code [#8](https://github.com/kevin-j-m/clockwork-test/pull/8)
+
+  *Kevin Murphy*
+
+* Test against ruby 2.3 explicitly [#9](https://github.com/kevin-j-m/clockwork-test/pull/9)
+
+  *Kevin Murphy*
+
+* Avoid changing global time zone state [#10](https://github.com/kevin-j-m/clockwork-test/pull/10)
+
+  *Adam Prescott*
+
+* Add Appraisal to test various versions of clockwork [#13](https://github.com/kevin-j-m/clockwork-test/pull/13)
+
+  *Kevin Murphy*
+
+* Update run loop to support clockwork versions >= 2.01 [#13](https://github.com/kevin-j-m/clockwork-test/pull/13)
+
+  *Kevin Murphy*
+
 ## 0.1.1
 
 * Pass clock file configuration to Clockwork::Test::Manager [#7](https://github.com/kevin-j-m/clockwork-test/pull/7)

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in clockwork-test.gemspec
 gemspec
+
+gem 'appraisal'

data/README.md

@@ -6,7 +6,9 @@
 
 `Clockwork::Test` includes additional functionality that makes testing of your `clock.rb` file easy. This gem can help make sure that you have scheduled your events appropriately, including testing `if:` or `at:` conditions, as well as allowing you to run assertions against the code that is executed when a job is run.
 
-`Clockwork::Test` has been verified against the latest release of clockwork at the time of its development, which is version 1.2.0. It does not require any specific test framework to be used with it, though all examples will use `rspec`.
+`Clockwork::Test` runs its test suite against various versions of clockwork, which are documented in the [Appraisals](Appraisals) file. The ruby versions its tested against are documented in the [Travis configuration](.travis.yml).
+
+`Clockwork::Test` does not require any specific test framework to be used with it, though all examples will use `rspec`.
 
 ## Installation
 

data/Rakefile

@@ -1,7 +1,9 @@
+require "rubygems"
+require "bundler/setup"
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-

data/gemfiles/clockwork_1_3_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "clockwork", "1.3.1"
+
+gemspec :path => "../"

data/gemfiles/clockwork_1_3_1.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: ..
+  specs:
+    clockwork-test (0.1.1)
+      clockwork
+      timecop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    clockwork (1.3.1)
+      activesupport
+      tzinfo
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.1)
+    method_source (0.8.2)
+    minitest (5.10.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (~> 1.7)
+  clockwork (= 1.3.1)
+  clockwork-test!
+  pry
+  rake (~> 10.0)
+  rspec
+  rspec-its
+
+BUNDLED WITH
+   1.14.6

data/gemfiles/clockwork_2_0_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "clockwork", "2.0.0"
+
+gemspec :path => "../"

data/gemfiles/clockwork_2_0_0.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: ..
+  specs:
+    clockwork-test (0.1.1)
+      clockwork
+      timecop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    clockwork (2.0.0)
+      activesupport
+      tzinfo
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.1)
+    method_source (0.8.2)
+    minitest (5.10.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (~> 1.7)
+  clockwork (= 2.0.0)
+  clockwork-test!
+  pry
+  rake (~> 10.0)
+  rspec
+  rspec-its
+
+BUNDLED WITH
+   1.14.6

data/gemfiles/clockwork_2_0_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "clockwork", "2.0.1"
+
+gemspec :path => "../"

data/gemfiles/clockwork_2_0_1.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: ..
+  specs:
+    clockwork-test (0.1.1)
+      clockwork
+      timecop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    clockwork (2.0.1)
+      activesupport
+      tzinfo
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.1)
+    method_source (0.8.2)
+    minitest (5.10.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (~> 1.7)
+  clockwork (= 2.0.1)
+  clockwork-test!
+  pry
+  rake (~> 10.0)
+  rspec
+  rspec-its
+
+BUNDLED WITH
+   1.14.6

data/gemfiles/clockwork_2_0_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "clockwork", "2.0.2"
+
+gemspec :path => "../"

data/gemfiles/clockwork_2_0_2.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: ..
+  specs:
+    clockwork-test (0.1.1)
+      clockwork
+      timecop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    clockwork (2.0.2)
+      activesupport
+      tzinfo
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.1)
+    method_source (0.8.2)
+    minitest (5.10.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (~> 1.7)
+  clockwork (= 2.0.2)
+  clockwork-test!
+  pry
+  rake (~> 10.0)
+  rspec
+  rspec-its
+
+BUNDLED WITH
+   1.14.6

data/lib/clockwork/test/manager.rb

@@ -25,7 +25,7 @@ module Clockwork
           Timecop.travel(@start_time)
         end
 
-        super()
+        tick_loop
 
         Timecop.return if @time_altered
       end
@@ -46,23 +46,20 @@ module Clockwork
 
       attr_reader :history
 
-      def loop(&block)
-        while 1 == 1 do
+      def tick_loop
+        while true do
           update_job_history
 
-          block.call
+          tick
+          increase_time
 
           @total_ticks += 1
           break if ticks_exceeded? || time_exceeded?
         end
       end
 
-      def sleep(interval)
-        if @tick_speed
-          Timecop.travel(Time.now + @tick_speed)
-        else
-          super
-        end
+      def increase_time
+        Timecop.travel(Time.now + @tick_speed) if @tick_speed
       end
 
       def register(period, job, block, options)

data/lib/clockwork/test/rspec/matchers/have_run.rb

@@ -18,26 +18,15 @@ module Clockwork
           end
 
           def once
-            @times_run = 1
-            @exactly = true
-
-            self
+            time(1)
           end
 
           def exactly(times)
-            @times_run = times
-            @exactly = true
-
-            self
+            time(times)
           end
 
           def times(times = nil)
-            if times
-              @times_run = times
-              @exactly = true
-            end
-
-            self
+            time(times)
           end
 
           def time(times = nil)

data/lib/clockwork/test/version.rb

@@ -1,5 +1,5 @@
 module Clockwork
   module Test
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/acceptance/clock_spec.rb

@@ -52,9 +52,7 @@ describe "Clockwork" do
     subject(:clockwork) { Clockwork::Test }
 
     before(:each) do
-      Time.zone = time_zone
-
-      Clockwork::Test.run(clock_opts)
+      Time.use_zone(time_zone) { Clockwork::Test.run(clock_opts) }
     end
 
     after(:each) { Clockwork::Test.clear! }

data/spec/clockwork/test/manager_spec.rb

@@ -51,7 +51,7 @@ describe Clockwork::Test::Manager do
 
       it "stops running after reaching the end time" do
         manager.run
-        expect(Time.current).to be_within(1.second).of(end_time)
+        expect(Time.current).to be_within(2.seconds).of(end_time)
         expect(manager.total_ticks).to be > 0
       end
 
@@ -60,7 +60,7 @@ describe Clockwork::Test::Manager do
 
         it "stops running after reaching the end time specified in the call" do
           manager.run(end_time: method_end_time)
-          expect(Time.current).to be_within(1.second).of(method_end_time)
+          expect(Time.current).to be_within(2.seconds).of(method_end_time)
           expect(manager.total_ticks).to be > 0
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clockwork-test
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kevin Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,12 +118,21 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - clockwork-test.gemspec
+- gemfiles/clockwork_1_3_1.gemfile
+- gemfiles/clockwork_1_3_1.gemfile.lock
+- gemfiles/clockwork_2_0_0.gemfile
+- gemfiles/clockwork_2_0_0.gemfile.lock
+- gemfiles/clockwork_2_0_1.gemfile
+- gemfiles/clockwork_2_0_1.gemfile.lock
+- gemfiles/clockwork_2_0_2.gemfile
+- gemfiles/clockwork_2_0_2.gemfile.lock
 - lib/clockwork/test.rb
 - lib/clockwork/test/event.rb
 - lib/clockwork/test/job_history.rb
@@ -157,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Test clockwork scheduled jobs