appsignal 1.2.0 → 1.2.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d44539c4d934bc6c75a61244bc52dcc2a67d75a5
-  data.tar.gz: a90fa4a59e8d2529aa5bfd67e8e80d0184d26792
+  metadata.gz: 350007064e166fbb91f0ac4dd1a84d4ef0830c71
+  data.tar.gz: cac950f88072c96359cad08e06c348b73ea36d77
 SHA512:
-  metadata.gz: a4714eeb4f848bd99460320f35dfcd9429462a49b178c1cb0dcf6e94bab432a4af261ecd68bf07975c4eb15699cd729539cd3f0b109789338405ef7096681c80
-  data.tar.gz: 66db0f2a4b0019a00b052ae6fde322c6fd4de6621ea7068a90e7f61e5f1740c281ba6817ae7d59ca54819136d44d001ce735b29940c40162928e1055e1c678db
+  metadata.gz: 320de9094dddc0782864706cbf8886e30d5e1a5e44a5a828645f19c16b7a18d78becb98c93b582c2d3d8e8678dfef19451ad331fb05664ab7d995f4ebf7ee8e1
+  data.tar.gz: e1354c1a4966f439a8220a0147d5d7545654fbaf8acd060ef1b40efc42255f6c80691653b82d92eb4cb7ff1626db1e657809e2f95a967175ada8021e15139d3a

data/.travis.yml

@@ -22,6 +22,7 @@ gemfile:
   - "gemfiles/rails-5.0.gemfile"
   - "gemfiles/resque.gemfile"
   - "gemfiles/sequel.gemfile"
+  - "gemfiles/sequel-435.gemfile"
   - "gemfiles/sinatra.gemfile"
   - "gemfiles/grape.gemfile"
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.2.1
+* Use Dir.pwd in CLI install wizard
+* Support bignums when setting queue length
+* Support for Sequel 4.35
+
 # 1.2.0
 * Restart background thread when FD's are closed
 * Beta version of collecting host metrics (disabled by default)

data/README.md

@@ -4,7 +4,7 @@ AppSignal agent
 This gem collects error and performance data from your Rails
 applications and sends it to [AppSignal](https://appsignal.com)
 
-[![Build Status](https://travis-ci.org/appsignal/appsignal.png?branch=master)](https://travis-ci.org/appsignal/appsignal)
+[![Build Status](https://travis-ci.org/appsignal/appsignal.png?branch=master)](https://travis-ci.org/appsignal/appsignal-ruby)
 [![Gem Version](https://badge.fury.io/rb/appsignal.svg)](http://badge.fury.io/rb/appsignal)
 [![Code Climate](https://codeclimate.com/github/appsignal/appsignal.png)](https://codeclimate.com/github/appsignal/appsignal)
 

data/Rakefile

@@ -11,6 +11,7 @@ GEMFILES = %w(
   rails-5.0
   resque
   sequel
+  sequel-435
   sinatra
   grape
 )

data/ext/agent.yml

@@ -1,15 +1,15 @@
 ---
-version: 9eb5938
+version: 2dbe674
 triples:
   x86_64-linux:
-    checksum: d66427bad79417552567527ccbba1be0984c22dd3d58857da69566d531ef2cd8
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9eb5938/appsignal-x86_64-linux-all-static.tar.gz
+    checksum: 1b6fc9edd036b7f36810430a95b78fded2b901fa7d5fb8d2de9677de7df3c106
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/2dbe674/appsignal-x86_64-linux-all-static.tar.gz
   i686-linux:
-    checksum: 30fb48f9f28004bb4ca41e7af83efbe8781208e4d9dcc044df069dc74f894363
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9eb5938/appsignal-i686-linux-all-static.tar.gz
+    checksum: fccad1b6c1df87fe7ed3c001567f902a95a029006354db2f10c512dc5ce0c262
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/2dbe674/appsignal-i686-linux-all-static.tar.gz
   x86-linux:
-    checksum: 30fb48f9f28004bb4ca41e7af83efbe8781208e4d9dcc044df069dc74f894363
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9eb5938/appsignal-i686-linux-all-static.tar.gz
+    checksum: fccad1b6c1df87fe7ed3c001567f902a95a029006354db2f10c512dc5ce0c262
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/2dbe674/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: 356032a3c8f137481c19cb6b960117a2e11aeacbc7d663ae05e11e710bd3f6cd
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9eb5938/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 0129536474fdfd4db707f74de467796aeca5862ef1d792d4e9b3a8badae55156
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/2dbe674/appsignal-x86_64-darwin-all-static.tar.gz

data/ext/appsignal_extension.c

@@ -123,13 +123,18 @@ static VALUE set_transaction_action(VALUE self, VALUE action) {
 
 static VALUE set_transaction_queue_start(VALUE self, VALUE queue_start) {
   appsignal_transaction* transaction;
+  int queue_start_type;
+
+  queue_start_type = TYPE(queue_start);
+  if (queue_start_type != T_FIXNUM && queue_start_type != T_BIGNUM) {
+      rb_raise(rb_eTypeError, "queue_start should be a Fixnum or Bignum");
+  }
 
-  Check_Type(queue_start, T_FIXNUM);
   Data_Get_Struct(self, appsignal_transaction, transaction);
 
   appsignal_set_transaction_queue_start(
       transaction,
-      FIX2LONG(queue_start)
+      NUM2LONG(queue_start)
   );
   return Qnil;
 }

data/gemfiles/sequel-435.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'sequel', '~> 4.35'
+gem 'sqlite3'
+
+gemspec :path => '../'

data/gemfiles/sequel.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sequel'
+gem 'sequel', '< 4.35'
 gem 'sqlite3'
 
 gemspec :path => '../'

data/lib/appsignal.rb

@@ -39,7 +39,7 @@ module Appsignal
 
       unless @config
         @config = Config.new(
-          ENV['PWD'],
+          Dir.pwd,
           ENV['APPSIGNAL_APP_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV']
         )
       end

data/lib/appsignal/cli.rb

@@ -45,7 +45,7 @@ module Appsignal
 
       def config
         Appsignal::Config.new(
-          ENV['PWD'],
+          Dir.pwd,
           options[:environment],
           initial_config,
           Logger.new(StringIO.new)

data/lib/appsignal/cli/install.rb

@@ -64,7 +64,7 @@ module Appsignal
         end
 
         def install_for_rails(config)
-          require File.expand_path(File.join(ENV['PWD'], 'config/application.rb'))
+          require File.expand_path(File.join(Dir.pwd, 'config/application.rb'))
 
           puts 'Installing for Ruby on Rails'
 
@@ -187,7 +187,7 @@ module Appsignal
         end
 
         def configure(config, environments, name_overwritten)
-          deploy_rb_file = File.join(ENV['PWD'], 'config/deploy.rb')
+          deploy_rb_file = File.join(Dir.pwd, 'config/deploy.rb')
           if File.exists?(deploy_rb_file) && (File.read(deploy_rb_file) =~ /require (\'|\").\/appsignal\/capistrano/).nil?
             print 'Adding AppSignal integration to deploy.rb'
             File.open(deploy_rb_file, 'a') do |f|
@@ -285,7 +285,7 @@ module Appsignal
 
         def rails_environments
           @environments ||= Dir.glob(
-            File.join(ENV['PWD'], 'config/environments/*.rb')
+            File.join(Dir.pwd, 'config/environments/*.rb')
           ).map { |o| File.basename(o, ".rb") }.sort - EXCLUDED_ENVIRONMENTS
         end
 
@@ -298,8 +298,8 @@ module Appsignal
 
           config = template.result(OpenStruct.new(data).instance_eval { binding })
 
-          FileUtils.mkdir_p(File.join(ENV['PWD'], 'config'))
-          File.write(File.join(ENV['PWD'], 'config/appsignal.yml'), config)
+          FileUtils.mkdir_p(File.join(Dir.pwd, 'config'))
+          File.write(File.join(Dir.pwd, 'config/appsignal.yml'), config)
         end
       end
     end

data/lib/appsignal/hooks/sequel.rb

@@ -1,6 +1,6 @@
 module Appsignal
   class Hooks
-    module SequelExtension
+    module SequelLogExtension
       # Add query instrumentation
       def log_yield(sql, args = nil)
         ActiveSupport::Notifications.instrument(
@@ -12,6 +12,18 @@ module Appsignal
       end
     end
 
+    module SequelLogConnectionExtension
+      # Add query instrumentation
+      def log_connection_yield(sql, conn, args = nil)
+        ActiveSupport::Notifications.instrument(
+          'sql.sequel',
+          :sql => sql
+        ) do
+          yield
+        end
+      end
+    end
+
     class SequelHook < Appsignal::Hooks::Hook
       register :sequel
 
@@ -23,10 +35,17 @@ module Appsignal
 
       def install
         # Register the extension...
-        ::Sequel::Database.register_extension(
-          :appsignal_integration,
-          Appsignal::Hooks::SequelExtension
-        )
+        if ::Sequel::MAJOR >= 4 && ::Sequel::MINOR >= 35
+          ::Sequel::Database.register_extension(
+            :appsignal_integration,
+            Appsignal::Hooks::SequelLogConnectionExtension
+          )
+        else
+          ::Sequel::Database.register_extension(
+            :appsignal_integration,
+            Appsignal::Hooks::SequelLogExtension
+          )
+        end
 
         # ... and automatically add it to future instances.
         ::Sequel::Database.extension(:appsignal_integration)

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.2.0'
+  VERSION = '1.2.1.beta.1'
 end

data/spec/lib/appsignal/cli/install_spec.rb

@@ -13,7 +13,7 @@ describe Appsignal::CLI::Install do
   let(:auth_check) { double }
 
   before do
-    ENV['PWD'] = project_fixture_path
+    Dir.stub(:pwd => project_fixture_path)
     @original_stdout = $stdout
     $stdout = out_stream
     Appsignal::AuthCheck.stub(:new => auth_check)
@@ -113,7 +113,7 @@ describe Appsignal::CLI::Install do
 
       describe ".rails_environments" do
         before do
-          ENV['PWD'] = project_fixture_path
+          Dir.stub(:pwd => project_fixture_path)
         end
 
         subject { cli.rails_environments }
@@ -379,7 +379,7 @@ describe Appsignal::CLI::Install do
       let(:config_dir) { File.join(tmp_dir, 'config') }
       let(:deploy_rb_file) { File.join(tmp_dir, 'config/deploy.rb') }
       before do
-        ENV['PWD'] = tmp_dir
+        Dir.stub(:pwd => tmp_dir)
         FileUtils.mkdir_p(config_dir)
         FileUtils.touch(deploy_rb_file)
         cli.should_receive(:gets).once.and_return('2')
@@ -423,7 +423,7 @@ describe Appsignal::CLI::Install do
 
   context ".write_config_file" do
     before do
-      ENV['PWD'] = tmp_dir
+      Dir.stub(:pwd => tmp_dir)
     end
 
     it "should write a config file with environments" do

data/spec/lib/appsignal/cli_spec.rb

@@ -7,7 +7,7 @@ describe Appsignal::CLI do
   before do
     @original_stdout = $stdout
     $stdout = out_stream
-    ENV['PWD'] = project_fixture_path
+    Dir.stub(:pwd => project_fixture_path)
     cli.options = {:environment => 'production'}
   end
   after do

data/spec/lib/appsignal/hooks/sequel_spec.rb

@@ -1,16 +1,17 @@
 require 'spec_helper'
 
-describe "Sequel integration", if: sequel_present? do
+describe Appsignal::Hooks::SequelHook, if: sequel_present? do
   let(:db) { Sequel.sqlite }
 
-  before do
+  before :all do
     start_agent
   end
 
-  context "with Sequel" do
-    before { Appsignal::Transaction.create('uuid', Appsignal::Transaction::HTTP_REQUEST, 'test') }
+  its(:dependencies_present?) { should be_true }
 
+  context "with a transaction" do
     it "should instrument queries" do
+      Appsignal::Transaction.create('uuid', Appsignal::Transaction::HTTP_REQUEST, 'test')
       expect( Appsignal::Transaction.current ).to receive(:start_event)
         .at_least(:once)
       expect( Appsignal::Transaction.current ).to receive(:finish_event)
@@ -21,3 +22,7 @@ describe "Sequel integration", if: sequel_present? do
     end
   end
 end
+
+describe Appsignal::Hooks::SequelHook, unless: sequel_present? do
+  its(:dependencies_present?) { should be_false }
+end

data/spec/spec_helper.rb

@@ -142,7 +142,6 @@ RSpec.configure do |config|
   end
 
   config.before do
-    ENV['PWD'] = File.expand_path(File.join(File.dirname(__FILE__), '../'))
     ENV['RAILS_ENV'] = 'test'
 
     # Clean environment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -144,6 +144,7 @@ files:
 - gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
 - gemfiles/resque.gemfile
+- gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
 - lib/appsignal.rb
@@ -299,9 +300,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5