appsignal 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf4d3d92b5e67aff267fd1880d628c2dc4ba659
-  data.tar.gz: 68949bc1100768cb6077257b5fe68ae9d04b35e3
+  metadata.gz: a97493676106452572f060f431a43d086d14f307
+  data.tar.gz: f08d472b67de0c9c60281534c89630610c8ff3ea
 SHA512:
-  metadata.gz: b812cb56ebaaac9a3f2a78491e632fcc94610489d8f0270b750287cffd019f9b0aaadf71b72def6295a01e0b0a8d4fe164614be928b73cd7dcc64cb99e96b857
-  data.tar.gz: 876865353b48096685c24b3c4d3fc19c1fa285cee138fd444408fb80a32f20770734bf0fef8fd119678d9567b4e86b20fa2422effe9f887164d9345004b8f5ff
+  metadata.gz: 3f64225eb581be6726079d4e68d74f4060e28d3c53a648a3863871d0a7cf4ed44ecb294a94e4e61658436a7be3fb6a036a0fc0b13b698f6a0d3335471f59aaac
+  data.tar.gz: 8d312bcadddab44f10ccd60e2490a832e39e46187dd7f3176ab4859c00dc883fbdb8acaa0a2315870f1d2a8323ddb28c6386e1252ef99fcb4e9c6de36d5a17bb

data/.gitignore

@@ -19,8 +19,8 @@ Gemfile.lock
 gemfiles/*.lock
 .DS_Store
 .ruby-version
-bundle_and_spec_all_rbenv.sh
-bundle_and_spec_all_rvm.sh
+bundle_and_spec_all_rbenv
+bundle_and_spec_all_rvm
 ext/libappsignal.*
 ext/appsignal-agent
 ext/appsignal_extension.h

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.1
+* Fix for bug in gem initialization when using `safe_yaml` gem
+
 # 1.0.0
 * New version of event formatting and collection
 * Use native library and agent

data/Rakefile

@@ -24,12 +24,12 @@ RUBY_VERSIONS = %w(
 )
 
 EXCLUSIONS = {
-  'rails-5.0' => %w( 1.9.3-p551 2.0.0-p648 2.1.8)
+  'rails-5.0' => %w( 1.9.3 2.0.0 2.1.8)
 }
 
 VERSION_MANAGERS = {
-  :rbenv => 'rbenv local',
-  :rvm => 'rvm use'
+  :rbenv => lambda { |version| "rbenv local #{version}" },
+  :rvm => lambda { |version| "rvm use --default #{version.split('-').first}" }
 }
 
 task :publish do
@@ -103,7 +103,7 @@ task :publish do
 end
 
 task :install do
-  system 'cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make && cd ..'
+  system 'cd ext && rm -f libappsignal.a appsignal-agent appsignal_extension.h Makefile appsignal_extension.bundle && ruby extconf.rb && make && cd ..'
   GEMFILES.each do |gemfile|
     system "bundle --gemfile gemfiles/#{gemfile}.gemfile"
   end
@@ -119,7 +119,7 @@ end
 task :generate_bundle_and_spec_all do
   VERSION_MANAGERS.each do |version_manager, switch_command|
     out = []
-    if version_manager == 'rvm use'
+    if version_manager == :rvm
       out << '#!/bin/bash --login'
     else
       out << '#!/bin/sh'
@@ -127,14 +127,17 @@ task :generate_bundle_and_spec_all do
     out << 'rm -f .ruby-version'
     out << "echo 'Using #{version_manager}'"
     RUBY_VERSIONS.each do |version|
-      out << "echo 'Switching to #{version}'"
-      out << "#{switch_command} #{version} || { echo 'Switching Ruby failed'; exit 1; }"
-      out << 'cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make && cd ..'
+      short_version = version.split('-').first
+      out << "echo 'Switching to #{short_version}'"
+      out << "#{switch_command.call(version)} || { echo 'Switching Ruby failed'; exit 1; }"
+      out << "ruby -v"
+      out << "echo 'Compiling extension'"
+      out << 'cd ext && rm -f appsignal-agent appsignal_extension.bundle appsignal_extension.h libappsignal.a Makefile && ruby extconf.rb  && make && cd ..'
       GEMFILES.each do |gemfile|
-        unless EXCLUSIONS[gemfile] && EXCLUSIONS[gemfile].include?(version)
-          out << "echo 'Bundling #{gemfile} in #{version}'"
+        unless EXCLUSIONS[gemfile] && EXCLUSIONS[gemfile].include?(short_version)
+          out << "echo 'Bundling #{gemfile} in #{short_version}'"
           out << "bundle --quiet --gemfile gemfiles/#{gemfile}.gemfile || { echo 'Bundling failed'; exit 1; }"
-          out << "echo 'Running #{gemfile} in #{version}'"
+          out << "echo 'Running #{gemfile} in #{short_version}'"
           out << "env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec || { echo 'Running specs failed'; exit 1; }"
         end
       end
@@ -142,7 +145,8 @@ task :generate_bundle_and_spec_all do
     out << 'rm -f .ruby-version'
     out << "echo 'Successfully ran specs for all environments'"
 
-    script = "bundle_and_spec_all_#{version_manager}.sh"
+    script = "bundle_and_spec_all_#{version_manager}"
+    FileUtils.rm_f(script)
     File.open(script, 'w') do |file|
       file.write out.join("\n")
     end

data/circle.yml

@@ -0,0 +1,7 @@
+dependencies:
+  override:
+    - rake generate_bundle_and_spec_all
+
+test:
+  override:
+    - ./bundle_and_spec_all_rvm

data/ext/agent.yml

@@ -1,15 +1,15 @@
 ---
-:version: 9e5359a
-:triples:
+version: 9e5359a
+triples:
   x86_64-linux:
-    :checksum: cafe3e12730619db156edc7d36ce4c6e7a367fba94dcb509c0373e46beeacc00
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-x86_64-linux-static.tar.gz
-    :lib_filename: libappsignal.a
+    checksum: cafe3e12730619db156edc7d36ce4c6e7a367fba94dcb509c0373e46beeacc00
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-x86_64-linux-static.tar.gz
+    lib_filename: libappsignal.a
   i686-linux:
-    :checksum: 4f5453174877e5bbc61e686eadfd741870eb5ed7713a405440ba8cfa77a884d8
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-i686-linux-static.tar.gz
-    :lib_filename: libappsignal.a
+    checksum: 4f5453174877e5bbc61e686eadfd741870eb5ed7713a405440ba8cfa77a884d8
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-i686-linux-static.tar.gz
+    lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: 19d974f0ce1c8e1e296f631876f050992b2de055e0f835c07a811da6513c621d
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-x86_64-darwin-static.tar.gz
-    :lib_filename: libappsignal.a
+    checksum: 19d974f0ce1c8e1e296f631876f050992b2de055e0f835c07a811da6513c621d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-x86_64-darwin-static.tar.gz
+    lib_filename: libappsignal.a

data/ext/extconf.rb

@@ -30,7 +30,7 @@ end
 def install
   logger.info "Installing appsignal agent for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
 
-  unless AGENT_CONFIG[:triples].keys.include?(ARCH)
+  unless AGENT_CONFIG['triples'].keys.include?(ARCH)
     installation_failed(
       "AppSignal currently does not support your system architecture (#{ARCH})." \
       "Please let us know at support@appsignal.com, we aim to support everything our customers run."
@@ -38,21 +38,21 @@ def install
     return
   end
 
-  arch_config = AGENT_CONFIG[:triples][ARCH]
+  arch_config = AGENT_CONFIG['triples'][ARCH]
 
   unless File.exists?(ext_path('appsignal-agent')) &&
-           File.exists?(ext_path(arch_config[:lib_filename])) &&
+           File.exists?(ext_path(arch_config['lib_filename'])) &&
            File.exists?(ext_path('appsignal_extension.h'))
-    logger.info "Downloading agent release from #{arch_config[:download_url]}"
+    logger.info "Downloading agent release from #{arch_config['download_url']}"
 
-    archive = open(arch_config[:download_url])
+    archive = open(arch_config['download_url'])
 
-    if Digest::SHA256.hexdigest(archive.read) == arch_config[:checksum]
+    if Digest::SHA256.hexdigest(archive.read) == arch_config['checksum']
       logger.info 'Checksum of downloaded archive verified, extracting archive'
     else
       installation_failed(
         "Aborting installation, checksum of downloaded archive could not be verified: " \
-        "Expected '#{arch_config[:checksum]}', got '#{checksum}'."
+        "Expected '#{arch_config['checksum']}', got '#{checksum}'."
       )
       return
     end

data/lib/appsignal/extension.rb

@@ -20,7 +20,7 @@ module Appsignal
     end
 
     def self.agent_version
-      agent_config[:version]
+      agent_config['version']
     end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/lib/appsignal/extension_spec.rb

@@ -5,8 +5,8 @@ describe "extension loading and operation" do
   describe ".agent_config" do
     subject { Appsignal::Extension.agent_config }
 
-    it { should have_key(:version) }
-    it { should have_key(:triples) }
+    it { should have_key('version') }
+    it { should have_key('triples') }
   end
 
   describe ".agent_version" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -129,6 +129,7 @@ files:
 - appsignal.gemspec
 - benchmark.rake
 - bin/appsignal
+- circle.yml
 - ext/agent.yml
 - ext/appsignal_extension.c
 - ext/extconf.rb