copy_tuner_client 0.3.4 → 0.3.5

data/spec/copy_tuner_client/prefixed_logger_spec.rb

@@ -7,11 +7,11 @@ describe CopyTunerClient::PrefixedLogger do
   subject { CopyTunerClient::PrefixedLogger.new(prefix, output_logger) }
 
   it "provides the prefix" do
-    subject.prefix.should == prefix
+    expect(subject.prefix).to eq(prefix)
   end
 
   it "provides the logger" do
-    subject.original_logger.should == output_logger
+    expect(subject.original_logger).to eq(output_logger)
   end
 
   [:debug, :info, :warn, :error, :fatal].each do |level|
@@ -19,7 +19,7 @@ describe CopyTunerClient::PrefixedLogger do
       message = 'hello'
       subject.send(level, message)
 
-      output_logger.should have_entry(level, "#{prefix} #{thread_info} #{message}")
+      expect(output_logger).to have_entry(level, "#{prefix} #{thread_info} #{message}")
     end
   end
 
@@ -28,10 +28,10 @@ describe CopyTunerClient::PrefixedLogger do
 
     subject.flush
 
-    output_logger.should have_received(:flush)
+    expect(output_logger).to have_received(:flush)
   end
 
   it "doesn't call flush for a logger that doesn't respond to flush" do
-    lambda { subject.flush }.should_not raise_error
+    expect { subject.flush }.not_to raise_error
   end
 end

data/spec/copy_tuner_client/process_guard_spec.rb

@@ -25,7 +25,7 @@ describe CopyTunerClient::ProcessGuard do
 
     process_guard.start
 
-    poller.should have_received(:start)
+    expect(poller).to have_received(:start)
   end
 
   it "registers passenger hooks from the passenger master" do
@@ -36,8 +36,8 @@ describe CopyTunerClient::ProcessGuard do
     process_guard = build_process_guard(:logger => logger)
     process_guard.start
 
-    logger.should have_entry(:info, "Registered Phusion Passenger fork hook")
-    poller.should have_received(:start).never
+    expect(logger).to have_entry(:info, "Registered Phusion Passenger fork hook")
+    expect(poller).to have_received(:start).never
   end
 
   it "starts polling from a passenger worker" do
@@ -49,7 +49,7 @@ describe CopyTunerClient::ProcessGuard do
     process_guard.start
     passenger.spawn
 
-    poller.should have_received(:start)
+    expect(poller).to have_received(:start)
   end
 
   it "registers unicorn hooks from the unicorn master" do
@@ -62,8 +62,8 @@ describe CopyTunerClient::ProcessGuard do
     process_guard = build_process_guard(:logger => logger)
     process_guard.start
 
-    logger.should have_entry(:info, "Registered Unicorn fork hook")
-    poller.should have_received(:start).never
+    expect(logger).to have_entry(:info, "Registered Unicorn fork hook")
+    expect(poller).to have_received(:start).never
   end
 
   it "starts polling from a unicorn worker" do
@@ -77,7 +77,7 @@ describe CopyTunerClient::ProcessGuard do
     process_guard.start
     unicorn.spawn
 
-    poller.should have_received(:start)
+    expect(poller).to have_received(:start)
   end
 
   it "flushes when the process terminates" do
@@ -89,7 +89,7 @@ describe CopyTunerClient::ProcessGuard do
     end
     Process.wait
 
-    cache.should be_written
+    expect(cache).to be_written
   end
 
   it "flushes after running a resque job" do
@@ -103,8 +103,8 @@ describe CopyTunerClient::ProcessGuard do
     process_guard.start
     job.fork_and_perform
 
-    cache.should be_written
-    logger.should have_entry(:info, "Registered Resque after_perform hook")
+    expect(cache).to be_written
+    expect(logger).to have_entry(:info, "Registered Resque after_perform hook")
   end
 
   it "doesn't fail if only Resque is defined and not Resque::Job" do

data/spec/copy_tuner_client/request_sync_spec.rb

@@ -11,18 +11,18 @@ describe CopyTunerClient::RequestSync do
 
   it "invokes the upstream app" do
     result = subject.call(env)
-    app.should have_received(:call).with(env)
-    result.should == response
+    expect(app).to have_received(:call).with(env)
+    expect(result).to eq(response)
   end
 
   it "flushes defaults" do
     subject.call(env)
-    cache.should have_received(:flush)
+    expect(cache).to have_received(:flush)
   end
 
   it "downloads new copy" do
     subject.call(env)
-    cache.should have_received(:download)
+    expect(cache).to have_received(:download)
   end
 end
 
@@ -38,11 +38,11 @@ describe CopyTunerClient::RequestSync, 'serving assets' do
 
   it "does not flush defaults" do
     subject.call(env)
-    cache.should have_received(:flush).never
+    expect(cache).to have_received(:flush).never
   end
   it "does not download new copy" do
     subject.call(env)
-    cache.should have_received(:download).never
+    expect(cache).to have_received(:download).never
   end
 end
 
@@ -57,11 +57,11 @@ describe CopyTunerClient::RequestSync do
     subject { CopyTunerClient::RequestSync.new(app, :cache => cache, :interval => 10, :last_synced => Time.now) }
     it "does not flush defaults" do
       subject.call(env)
-      cache.should have_received(:flush).never
+      expect(cache).to have_received(:flush).never
     end
     it "does not download new copy" do
       subject.call(env)
-      cache.should have_received(:download).never
+      expect(cache).to have_received(:download).never
     end
   end
 
@@ -69,11 +69,11 @@ describe CopyTunerClient::RequestSync do
     subject { CopyTunerClient::RequestSync.new(app, :cache => cache, :interval => 10, :last_synced => Time.now - 60) }
     it "flushes defaults" do
       subject.call(env)
-      cache.should have_received(:flush)
+      expect(cache).to have_received(:flush)
     end
     it "downloads new copy" do
       subject.call(env)
-      cache.should have_received(:download)
+      expect(cache).to have_received(:download)
     end
   end
 
@@ -81,11 +81,11 @@ describe CopyTunerClient::RequestSync do
     subject { CopyTunerClient::RequestSync.new(app, :cache => cache, :interval => 10) }
     it "flushes defaults" do
       subject.call(env)
-      cache.should have_received(:flush)
+      expect(cache).to have_received(:flush)
     end
     it "downloads new copy" do
       subject.call(env)
-      cache.should have_received(:download)
+      expect(cache).to have_received(:download)
     end
   end
 end

data/spec/copy_tuner_client_spec.rb

@@ -8,12 +8,12 @@ describe CopyTunerClient do
   end
 
   it 'delegates cache to the configuration object' do
-    CopyTunerClient.cache.should == 'cache'
-    CopyTunerClient.configuration.should have_received(:cache).once
+    expect(CopyTunerClient.cache).to eq('cache')
+    expect(CopyTunerClient.configuration).to have_received(:cache).once
   end
 
   it 'delegates client to the configuration object' do
-    CopyTunerClient.client.should == 'client'
-    CopyTunerClient.configuration.should have_received(:client).once
+    expect(CopyTunerClient.client).to eq('client')
+    expect(CopyTunerClient.configuration).to have_received(:client).once
   end
 end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ Dir.glob(File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')).each do |file
 end
 
 WebMock.disable_net_connect!
-ShamRack.mount FakeCopyTunerApp.new, 'copy-tuner.com', 443
+ShamRack.at('copy-tuner.com', 443).mount(FakeCopyTunerApp.new)
 
 RSpec.configure do |config|
   config.include ClientSpecHelpers

data/spec/support/fake_copy_tuner_app.rb

@@ -158,6 +158,7 @@ class FakeCopyTunerApp < Sinatra::Base
     def self.open_project_data
       MUTEX.synchronize do
         project_file = File.expand_path('../../../tmp/projects.json', __FILE__)
+        FileUtils.mkdir_p File.dirname(project_file)
 
         if File.exist? project_file
           data = JSON.parse(IO.read(project_file))

data/spec/support/fake_logger.rb

@@ -47,11 +47,11 @@ RSpec::Matchers.define :have_entry do |severity, entry|
     logger.has_entry?(severity, entry)
   end
 
-  failure_message_for_should do
+  failure_message do
     "Expected #{severity}(#{entry.inspect}); got entries:\n\n#{entries}"
   end
 
-  failure_message_for_should_not do
+  failure_message_when_negated do
     "Unexpected #{severity}(#{entry.inspect}); got entries:\n\n#{entries}"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -126,16 +126,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
@@ -288,7 +288,6 @@ files:
 - spec/support/fake_unicorn.rb
 - spec/support/middleware_stack.rb
 - spec/support/writing_cache.rb
-- tmp/projects.json
 - ui/views/copytuner/index.html.erb
 - ui/views/layouts/copytuner_default.html.erb
 homepage: https://github.com/SonicGarden/copy-tuner-ruby-client
@@ -310,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Client for the CopyTuner copy management service
@@ -341,4 +340,3 @@ test_files:
 - spec/support/fake_unicorn.rb
 - spec/support/middleware_stack.rb
 - spec/support/writing_cache.rb
-has_rdoc: 

data/tmp/projects.json

@@ -1 +0,0 @@
-{}