timber 2.1.0.rc3 → 2.1.0.rc4

data/spec/timber/cli/installers/root_spec.rb

@@ -25,15 +25,16 @@ describe Timber::CLI::Installers::Root, :rails_23 => true do
     it "should run properly" do
       input.string = "y\n"
 
-      expect(installer).to receive(:install_platform).with(app).exactly(1).times.and_return(true)
-      expect(installer).to receive(:run_sub_installer).with(app).exactly(1).times.and_return(true)
-      expect(installer).to receive(:send_test_messages).exactly(1).times.and_return(true)
-      expect(installer).to receive(:confirm_log_delivery).exactly(1).times.and_return(true)
-      expect(installer).to receive(:assist_with_git).exactly(1).times.and_return(true)
+      expect(installer).to receive(:install_platform).with(app).exactly(1).times
+      expect(installer).to receive(:run_sub_installer).with(app).exactly(1).times
+      expect(installer).to receive(:send_test_messages).exactly(1).times
+      expect(installer).to receive(:confirm_log_delivery).exactly(1).times
+      expect(installer).to receive(:wrap_up).with(app).exactly(1).times
       expect(api).to receive(:event).with(:success).exactly(1).times
-      expect(installer).to receive(:collect_feedback).exactly(1).times.and_return(true)
+      expect(installer).to receive(:collect_feedback).exactly(1).times
+      expect(installer).to receive(:free_data).exactly(1).times
 
-      expect(installer.run(app)).to eq(true)
+      installer.run(app)
     end
   end
 

data/spec/timber/current_context_spec.rb

@@ -4,7 +4,7 @@ describe Timber::CurrentContext, :rails_23 => true do
   describe ".initialize" do
     it "should not set the release context" do
       context = described_class.send(:new)
-      expect(context.send(:hash)).to eq({})
+      expect(context.send(:hash)[:release]).to be_nil
     end
 
     context "with Heroku dyno metadata" do
@@ -24,7 +24,7 @@ describe Timber::CurrentContext, :rails_23 => true do
 
       it "should automatically set the release context" do
         context = described_class.send(:new)
-        expect(context.send(:hash)).to eq({:release=>{:commit_hash=>"2c3a0b24069af49b3de35b8e8c26765c1dba9ff0", :created_at=>"2015-04-02T18:00:42Z", :version=>"v2.3.1"}})
+        expect(context.send(:hash)[:release]).to eq({:commit_hash=>"2c3a0b24069af49b3de35b8e8c26765c1dba9ff0", :created_at=>"2015-04-02T18:00:42Z", :version=>"v2.3.1"})
       end
     end
 
@@ -45,7 +45,7 @@ describe Timber::CurrentContext, :rails_23 => true do
 
       it "should automatically set the release context" do
         context = described_class.send(:new)
-        expect(context.send(:hash)).to eq({:release=>{:commit_hash=>"2c3a0b24069af49b3de35b8e8c26765c1dba9ff0", :created_at=>"2015-04-02T18:00:42Z", :version=>"v2.3.1"}})
+        expect(context.send(:hash)[:release]).to eq({:commit_hash=>"2c3a0b24069af49b3de35b8e8c26765c1dba9ff0", :created_at=>"2015-04-02T18:00:42Z", :version=>"v2.3.1"})
       end
     end
   end
@@ -56,13 +56,13 @@ describe Timber::CurrentContext, :rails_23 => true do
     end
 
     it "should add the context" do
-      expect(described_class.instance.send(:hash)).to eq({})
+      expect(described_class.instance.send(:hash)[:custom]).to be_nil
 
       described_class.add({build: {version: "1.0.0"}})
-      expect(described_class.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+      expect(described_class.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}})
 
       described_class.add({testing: {key: "value"}})
-      expect(described_class.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}}})
+      expect(described_class.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}})
     end
   end
 
@@ -70,37 +70,37 @@ describe Timber::CurrentContext, :rails_23 => true do
     it "should remove the context by object" do
       context = {:build=>{:version=>"1.0.0"}}
       described_class.add(context)
-      expect(described_class.instance.send(:hash)).to eq({:custom => context})
+      expect(described_class.instance.send(:hash)[:custom]).to eq(context)
 
       described_class.remove(context)
-      expect(described_class.instance.send(:hash)).to eq({})
+      expect(described_class.instance.send(:hash)[:custom]).to be_nil
     end
 
     it "should remove context by key" do
       context = {:build=>{:version=>"1.0.0"}}
       described_class.add(context)
-      expect(described_class.instance.send(:hash)).to eq({:custom => context})
+      expect(described_class.instance.send(:hash)[:custom]).to eq(context)
 
       described_class.remove(:custom)
-      expect(described_class.instance.send(:hash)).to eq({})
+      expect(described_class.instance.send(:hash)[:custom]).to be_nil
     end
   end
 
   describe ".with" do
     it "should merge the context and cleanup on block exit" do
-      expect(described_class.instance.send(:hash)).to eq({})
+      expect(described_class.instance.send(:hash)[:custom]).to be_nil
 
       described_class.with({build: {version: "1.0.0"}}) do
-        expect(described_class.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+        expect(described_class.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}})
 
         described_class.with({testing: {key: "value"}}) do
-          expect(described_class.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}}})
+          expect(described_class.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}})
         end
 
-        expect(described_class.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+        expect(described_class.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}})
       end
 
-      expect(described_class.instance.send(:hash)).to eq({})
+      expect(described_class.instance.send(:hash)[:custom]).to be_nil
     end
   end
 end

data/spec/timber/events/http_server_request_spec.rb

@@ -21,7 +21,7 @@ describe Timber::Events::HTTPServerRequest, :rails_23 => true do
     it "should handle header encoding" do
       referer = 'http://www.metrojobb.se/jobb/1013893-skadeadministratör'.force_encoding('ASCII-8BIT')
       event = described_class.new(:headers => {'Referer' => referer}, :host => 'my.host.com', :method => 'GET', :path => '/path', :scheme => 'https')
-      expect(event.headers["referer"].encoding.to_s).to eq("UTF-8")
+      expect(event.headers.key?("referer")).to eq(false)
     end
   end
 end

data/spec/timber/log_devices/http_spec.rb

@@ -102,7 +102,7 @@ describe Timber::LogDevices::HTTP do
       request_queue = http.instance_variable_get(:@request_queue)
       request = request_queue.deq
       expect(request).to be_kind_of(Net::HTTP::Post)
-      expect(request.body).to start_with("\x92\x85\xA5level\xA4INFO\xA2dt\xBB2016-09-01T12:00:00.000000Z\xA7message\xB2test log message 1\xA7context\x81".force_encoding("ASCII-8BIT"))
+      expect(request.body).to start_with("\x92\x84\xA5level\xA4INFO\xA2dt\xBB2016-09-01T12:00:00.000000Z\xA7message\xB2test log message 1".force_encoding("ASCII-8BIT"))
 
       message_queue = http.instance_variable_get(:@msg_queue)
       expect(message_queue.size).to eq(0)
@@ -127,7 +127,7 @@ describe Timber::LogDevices::HTTP do
     it "should deliver requests on an interval" do
       stub = stub_request(:post, "https://logs.timber.io/frames").
         with(
-          :body => start_with("\x92\x85\xA5level\xA4INFO\xA2dt\xBB2016-09-01T12:00:00.000000Z\xA7message\xB2test log message 1\xA7context\x81\xA6system".force_encoding("ASCII-8BIT")),
+          :body => start_with("\x92\x84\xA5level\xA4INFO\xA2dt\xBB2016-09-01T12:00:00.000000Z\xA7message\xB2test log message 1".force_encoding("ASCII-8BIT")),
           :headers => {
             'Authorization' => 'Basic TVlLRVk=',
             'Content-Type' => 'application/msgpack',

data/spec/timber/logger_spec.rb

@@ -163,19 +163,19 @@ describe Timber::Logger, :rails_23 => true do
     let(:logger) { Timber::Logger.new(io) }
 
     it "should add context" do
-      expect(Timber::CurrentContext.instance.send(:hash)).to eq({})
+      expect(Timber::CurrentContext.instance.send(:hash)[:custom]).to be_nil
 
       logger.with_context(build: {version: "1.0.0"}) do
-        expect(Timber::CurrentContext.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+        expect(Timber::CurrentContext.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}})
 
         logger.with_context({testing: {key: "value"}}) do
-          expect(Timber::CurrentContext.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}}})
+          expect(Timber::CurrentContext.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}})
         end
 
-        expect(Timber::CurrentContext.instance.send(:hash)).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+        expect(Timber::CurrentContext.instance.send(:hash)[:custom]).to eq({:build=>{:version=>"1.0.0"}})
       end
 
-      expect(Timber::CurrentContext.instance.send(:hash)).to eq({})
+      expect(Timber::CurrentContext.instance.send(:hash)[:custom]).to be_nil
     end
   end
 

data/spec/timber/util/http_event_spec.rb

@@ -4,12 +4,12 @@ describe Timber::Util::HTTPEvent, :rails_23 => true do
   describe ".normalize_headers" do
     it "should ignore nils" do
       result = described_class.normalize_headers({"key" => nil})
-      expect(result).to eq({"key" => nil})
+      expect(result).to eq({})
     end
 
     it "should handle non strings" do
       result = described_class.normalize_headers({"key" => 1})
-      expect(result).to eq({"key" => 1})
+      expect(result).to eq({"key" => "1"})
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc3
+  version: 2.1.0.rc4
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -156,6 +156,7 @@ files:
 - lib/timber/cli/file_helper.rb
 - lib/timber/cli/installer.rb
 - lib/timber/cli/installers.rb
+- lib/timber/cli/installers/config_file.rb
 - lib/timber/cli/installers/other.rb
 - lib/timber/cli/installers/rails.rb
 - lib/timber/cli/installers/root.rb
@@ -231,7 +232,6 @@ files:
 - lib/timber/util/http_event.rb
 - lib/timber/util/object.rb
 - lib/timber/util/request.rb
-- lib/timber/util/string.rb
 - lib/timber/util/struct.rb
 - lib/timber/version.rb
 - spec/README.md
@@ -246,6 +246,9 @@ files:
 - spec/support/timber.rb
 - spec/support/timecop.rb
 - spec/support/webmock.rb
+- spec/timber/cli/config_file_spec.rb
+- spec/timber/cli/installers/config_file_spec.rb
+- spec/timber/cli/installers/other_spec.rb
 - spec/timber/cli/installers/rails_spec.rb
 - spec/timber/cli/installers/root_spec.rb
 - spec/timber/config_spec.rb
@@ -311,6 +314,9 @@ test_files:
 - spec/support/timber.rb
 - spec/support/timecop.rb
 - spec/support/webmock.rb
+- spec/timber/cli/config_file_spec.rb
+- spec/timber/cli/installers/config_file_spec.rb
+- spec/timber/cli/installers/other_spec.rb
 - spec/timber/cli/installers/rails_spec.rb
 - spec/timber/cli/installers/root_spec.rb
 - spec/timber/config_spec.rb

data/lib/timber/util/string.rb

@@ -1,21 +0,0 @@
-module Timber
-  module Util
-    # @private
-    module String
-      UTF8 = "UTF-8".freeze
-
-      # @private
-      def self.normalize_to_utf8(string)
-        if string.encoding.to_s == UTF8
-          string
-        else
-          string.encode(UTF8, {
-            :invalid => :replace,
-            :undef   => :replace,
-            :replace => '?'
-          })
-        end
-      end
-    end
-  end
-end