appsignal 2.5.0.alpha.1 → 2.5.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/CHANGELOG.md +3 -1
  4. data/Rakefile +89 -43
  5. data/appsignal.gemspec +1 -9
  6. data/ext/agent.yml +35 -35
  7. data/lib/appsignal/version.rb +1 -1
  8. data/spec/spec_helper.rb +7 -0
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aa4dc16e9ee1b853c9166e3c550e95820239d22fcf4be2bfbe908fff03681ce3
4
- data.tar.gz: 980caa31b345676bb7964fa941f9aa0116195e28d933aac6ade62b2834006834
3
+ metadata.gz: 427524203553140692acce6acb31b3cfa4efc877ca644b90626ab3a6248af293
4
+ data.tar.gz: 1da5d2aaa0c3c296ffffcc0261cfd348a2dd2c0126e9cfe98bbfb7c6a0034a7b
5
5
  SHA512:
6
- metadata.gz: 99c6c3197f6d895731d8afb3bda5ed65cb38f1b0a1e9fe8a6b98f457429a0011f7f81bd1eab4ccf89e1bee8cf2448c168a50b8d00fd443c1a47e74f6a168b7f9
7
- data.tar.gz: 49cfc74c9a975443b9b111c330e1b9b25600d6ac08c2a7c7037b46739af275f192f6b52e4ac5f713e622e795d5cbb285aff551b07035568e910033031645f019
6
+ metadata.gz: 52ca384f396f93b511c44a1a59a44ffc0c2e79e8ebe197475ce1c522a1150e6d6401ccf09f7b5eb5cd7d96da13cf5b1aa4525dc8c2932a8729c6fff496e6212c
7
+ data.tar.gz: 7e69263425b4931fb228087b9f94cbee8151784c339f746ee0d7ea4bc1f5f8bfba6608bb80fd9705393f38b8053920154db103dcf90a7b73bc5ef79d8724ae87
data/.gitignore CHANGED
@@ -31,3 +31,4 @@ ext/Makefile
31
31
  ext/*.bundle
32
32
  ext/*.o
33
33
  ext/*.so
34
+ pkg/
data/CHANGELOG.md CHANGED
@@ -1,5 +1,7 @@
1
- # 2.5.0 (Alpha)
1
+ # 2.5.0 (Beta)
2
2
  * Add jRuby support. PR #376
3
+ * Fix locking issue on diagnose mode run.
4
+ Commit e6c6de811f8115a73050fc865e89dd4945ddec57
3
5
 
4
6
  # 2.4.3
5
7
  * Store more details for Redis events. PR #374
data/Rakefile CHANGED
@@ -1,4 +1,5 @@
1
1
  require "bundler"
2
+ require "rubygems/package_task"
2
3
  require "fileutils"
3
4
 
4
5
  GEMFILES = %w[
@@ -38,75 +39,120 @@ VERSION_MANAGERS = {
38
39
  :rvm => ->(version) { "rvm use --default #{version.split("-").first}" }
39
40
  }.freeze
40
41
 
41
- task :publish do
42
- require "appsignal/version"
42
+ namespace :build do
43
+ def modify_base_gemspec
44
+ eval(File.read("appsignal.gemspec")).tap do |s| # rubocop:disable Security/Eval
45
+ yield s
46
+ end
47
+ end
43
48
 
44
- NAME = "appsignal".freeze
45
- VERSION_FILE = "lib/appsignal/version.rb".freeze
46
- CHANGELOG_FILE = "CHANGELOG.md".freeze
49
+ namespace :ruby do
50
+ spec = modify_base_gemspec do |s|
51
+ s.extensions = %w[ext/extconf.rb]
52
+ end
53
+
54
+ Gem::PackageTask.new(spec) { |_pkg| }
55
+ end
47
56
 
48
- raise "$EDITOR should be set" unless ENV["EDITOR"]
57
+ namespace :jruby do
58
+ spec = modify_base_gemspec do |s|
59
+ s.platform = "java"
60
+ s.extensions = %w[ext/Rakefile]
61
+ s.add_dependency "ffi"
62
+ end
49
63
 
50
- def build_and_push_gem
51
- puts "# Building gem"
52
- FileUtils.rm_f("#{NAME}-#{gem_version}.gem")
53
- puts `gem build #{NAME}.gemspec`
54
- puts "# Publishing Gem"
55
- puts `gem push #{NAME}-#{gem_version}.gem`
64
+ Gem::PackageTask.new(spec) { |_pkg| }
56
65
  end
57
66
 
58
- def create_and_push_tag
59
- puts `git commit -am 'Bump to #{version} [ci skip]'`
60
- puts "# Creating tag #{version}"
61
- puts `git tag #{version}`
62
- puts `git push origin #{version}`
63
- puts `git push origin #{current_branch}`
64
- rescue
65
- raise "Tag: '#{version}' already exists"
67
+ desc "Build all gem versions"
68
+ task :all => ["ruby:gem", "jruby:gem"]
69
+
70
+ desc "Clean up all gem build artifacts"
71
+ task :clean do
72
+ FileUtils.rm_rf File.expand_path("../pkg", __FILE__)
66
73
  end
74
+ end
75
+
76
+ namespace :publish do
77
+ VERSION_FILE = "lib/appsignal/version.rb".freeze
78
+ CHANGELOG_FILE = "CHANGELOG.md".freeze
67
79
 
68
80
  def changes
69
81
  git_status_to_array(`git status -s -u`)
70
82
  end
71
83
 
72
- def gem_version
73
- Appsignal::VERSION
74
- end
75
-
76
- def version
77
- @version ||= "v#{gem_version}"
84
+ def git_status_to_array(changes)
85
+ changes.split("\n").each { |change| change.gsub!(/^.. /, "") }
78
86
  end
79
87
 
80
88
  def current_branch
81
89
  `git rev-parse --abbrev-ref HEAD`.chomp
82
90
  end
83
91
 
84
- def git_status_to_array(changes)
85
- changes.split("\n").each { |change| change.gsub!(/^.. /, "") }
92
+ task :check_requirements do
93
+ unless changes.empty?
94
+ puts "ERROR: There should be no uncommitted file changes."
95
+ exit 1
96
+ end
97
+ unless ENV["EDITOR"]
98
+ puts "ERROR: $EDITOR environment variable should be set."
99
+ exit 1
100
+ end
86
101
  end
87
102
 
88
- raise "Branch should hold no uncommitted file change)" unless changes.empty?
103
+ task :configure_version do
104
+ puts "\n# Configuring new gem version"
89
105
 
90
- system("$EDITOR #{VERSION_FILE}")
91
- unless changes.member?(VERSION_FILE)
92
- raise "Actually change the version in: #{VERSION_FILE}"
106
+ system "$EDITOR #{VERSION_FILE}"
107
+ unless changes.member?(VERSION_FILE)
108
+ puts "ERROR: Please actually change the gem version in: #{VERSION_FILE}"
109
+ exit 1
110
+ end
111
+
112
+ puts "\n# Updating the changelog"
113
+ system "$EDITOR #{CHANGELOG_FILE}"
93
114
  end
94
115
 
95
- Appsignal.send(:remove_const, :VERSION)
96
- load File.expand_path(VERSION_FILE)
97
- system("$EDITOR #{CHANGELOG_FILE}")
116
+ task :push_gem_packages do
117
+ puts "\n# Pushing gem packages"
118
+ Dir.chdir("#{File.dirname(__FILE__)}/pkg") do
119
+ Dir["*.gem"].each do |gem_package|
120
+ puts "## Publishing gem package: #{gem_package}"
121
+ puts `gem push #{gem_package}`
122
+ end
123
+ end
124
+ end
98
125
 
99
- # Build and push for MRI
100
- ENV.delete("APPSIGNAL_PUSH_JAVA_GEM")
101
- build_and_push_gem
126
+ task :tag_and_push_version do
127
+ # Make sure to load the new version number
128
+ Appsignal.send(:remove_const, :VERSION)
129
+ load File.expand_path(VERSION_FILE)
130
+ version = "v#{Appsignal::VERSION}"
102
131
 
103
- # Build and push for jRuby
104
- ENV["APPSIGNAL_PUSH_JAVA_GEM"] = "true"
105
- build_and_push_gem
132
+ begin
133
+ puts `git commit -am 'Bump to #{version} [ci skip]'`
134
+ puts "# Creating tag #{version}"
135
+ puts `git tag #{version}`
136
+ puts `git push origin #{version}`
137
+ puts `git push origin #{current_branch}`
138
+ rescue
139
+ puts "ERROR: Tag '#{version}' already exists"
140
+ exit 1
141
+ end
142
+ end
106
143
 
107
- # Create tag
108
- create_and_push_tag
144
+ task :build => "build:clean" do
145
+ # Shell out to build so the new version is loaded in the gemspec.
146
+ `rake build:all`
147
+ end
109
148
  end
149
+ task :publish => [
150
+ "publish:check_requirements",
151
+ "publish:configure_version",
152
+ "publish:build",
153
+ "publish:push_gem_packages",
154
+ "publish:tag_and_push_version"
155
+ ]
110
156
 
111
157
  desc "Install the AppSignal gem, extension and all possible dependencies."
112
158
  task :install => "extension:install" do
data/appsignal.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  require File.expand_path("../lib/appsignal/version", __FILE__)
4
4
 
5
- Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
5
+ Gem::Specification.new do |gem|
6
6
  gem.authors = [
7
7
  "Robert Beekman",
8
8
  "Thijs Cadier"
@@ -22,14 +22,6 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
22
22
  gem.version = Appsignal::VERSION
23
23
  gem.required_ruby_version = ">= 1.9"
24
24
 
25
- if RUBY_PLATFORM == "java" || ENV["APPSIGNAL_PUSH_JAVA_GEM"]
26
- gem.platform = "java"
27
- gem.extensions = %w[ext/Rakefile]
28
- gem.add_dependency "ffi"
29
- else
30
- gem.extensions = %w[ext/extconf.rb]
31
- end
32
-
33
25
  gem.add_dependency "rack"
34
26
 
35
27
  gem.add_development_dependency "rake", "~> 11"
data/ext/agent.yml CHANGED
@@ -1,64 +1,64 @@
1
1
  ---
2
- version: 57a48f4
2
+ version: ee63235
3
3
  triples:
4
4
  x86_64-darwin:
5
5
  static:
6
- checksum: 4fa30287925bad17abb3e86784793e13399dd9390c0579ca94bd8f4ee7a832a3
7
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-static.tar.gz
6
+ checksum: 44566908e93a31fbbc5f4ba35f41de99947c3c748287283600868fbbe5c18338
7
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-darwin-all-static.tar.gz
8
8
  dynamic:
9
- checksum: 1380d4d7263b0fe2a546085efa64643289010b7dd21282c2900e81164a123e8d
10
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-dynamic.tar.gz
9
+ checksum: b8b89b8ca9af16767f9ae61fa4ab67df1bdb33977cdeb84a4ab53c3e145af6f7
10
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-darwin-all-dynamic.tar.gz
11
11
  universal-darwin:
12
12
  static:
13
- checksum: 4fa30287925bad17abb3e86784793e13399dd9390c0579ca94bd8f4ee7a832a3
14
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-static.tar.gz
13
+ checksum: 44566908e93a31fbbc5f4ba35f41de99947c3c748287283600868fbbe5c18338
14
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-darwin-all-static.tar.gz
15
15
  dynamic:
16
- checksum: 1380d4d7263b0fe2a546085efa64643289010b7dd21282c2900e81164a123e8d
17
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-darwin-all-dynamic.tar.gz
16
+ checksum: b8b89b8ca9af16767f9ae61fa4ab67df1bdb33977cdeb84a4ab53c3e145af6f7
17
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-darwin-all-dynamic.tar.gz
18
18
  i686-linux:
19
19
  static:
20
- checksum: 9a1e59dd42e5ddcd0af04c0cffb0aadeace05dfae46d00aec71e90490186cbfd
21
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-static.tar.gz
20
+ checksum: 85d4ac72aaed0b08226fc5a12fe210f2789d97bc162e15d8d36273c3936a5e19
21
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-i686-linux-all-static.tar.gz
22
22
  dynamic:
23
- checksum: ef45877189d3ea4be568ec2fa64a0f04fc94783c42e53f6a55672576a2cfb150
24
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-dynamic.tar.gz
23
+ checksum: 7d4cbbcd8d68eb357c1b759237d290ed43ca517c4654439d22d2b802029ba42f
24
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-i686-linux-all-dynamic.tar.gz
25
25
  x86-linux:
26
26
  static:
27
- checksum: 9a1e59dd42e5ddcd0af04c0cffb0aadeace05dfae46d00aec71e90490186cbfd
28
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-static.tar.gz
27
+ checksum: 85d4ac72aaed0b08226fc5a12fe210f2789d97bc162e15d8d36273c3936a5e19
28
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-i686-linux-all-static.tar.gz
29
29
  dynamic:
30
- checksum: ef45877189d3ea4be568ec2fa64a0f04fc94783c42e53f6a55672576a2cfb150
31
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-all-dynamic.tar.gz
30
+ checksum: 7d4cbbcd8d68eb357c1b759237d290ed43ca517c4654439d22d2b802029ba42f
31
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-i686-linux-all-dynamic.tar.gz
32
32
  i686-linux-musl:
33
33
  static:
34
- checksum: cfa14d6aa3ad419a1d87854dfb13a780b34e4ccbf3afbe6adc7704ef750fc414
35
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-musl-all-static.tar.gz
34
+ checksum: 59beb7c8b7b6e3ade4f654e300aa53cb0a7d9bbbd547257b52d2e19c49ddb6d5
35
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-i686-linux-musl-all-static.tar.gz
36
36
  x86-linux-musl:
37
37
  static:
38
- checksum: cfa14d6aa3ad419a1d87854dfb13a780b34e4ccbf3afbe6adc7704ef750fc414
39
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-i686-linux-musl-all-static.tar.gz
38
+ checksum: 59beb7c8b7b6e3ade4f654e300aa53cb0a7d9bbbd547257b52d2e19c49ddb6d5
39
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-i686-linux-musl-all-static.tar.gz
40
40
  x86_64-linux:
41
41
  static:
42
- checksum: 8a68e7da4710fc97be73210437c890897a84f37f6ae9095f36d61099e52f07dc
43
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-linux-all-static.tar.gz
42
+ checksum: a05243504688705d93caf105da29ecbca6b190eb2cd9b0f09673aacd4824d435
43
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-linux-all-static.tar.gz
44
44
  dynamic:
45
- checksum: 5b2806ae841a6052f55c0824370dad41a04ae0ad2025df87a54847cce81054c3
46
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-linux-all-dynamic.tar.gz
45
+ checksum: a2c12ab249c51995a214c9036baf19d384b958f0107079c8de0016d73e5858f3
46
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-linux-all-dynamic.tar.gz
47
47
  x86_64-linux-musl:
48
48
  static:
49
- checksum: ffc91182064c1f0dbd9d219816054903fcc28db977cdd74df15802c468a2f252
50
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-linux-musl-all-static.tar.gz
49
+ checksum: 9ddbc05f47776d712e58be84f0d31fe1cb23eeab90afe79a2724db13b1471ba4
50
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-linux-musl-all-static.tar.gz
51
51
  x86_64-freebsd:
52
52
  static:
53
- checksum: c1781a09ec4e4c9e2f08a60e662acd8790286ebad62c9d32712a7932d0852a10
54
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-static.tar.gz
53
+ checksum: b7200bf705cdbafad2d62f24554f90a7f317ad9fc4121e9a8a33f36bf1060215
54
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-freebsd-all-static.tar.gz
55
55
  dynamic:
56
- checksum: 0ce479051f5734b330d91811c51813d93e65758ecad97e5f6b9e86764480e7c2
57
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-dynamic.tar.gz
56
+ checksum: ff86021f4f6f1fd40cb95ba5a60632954273f9f5dab17d8d45fdd6000acb38d4
57
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-freebsd-all-dynamic.tar.gz
58
58
  amd64-freebsd:
59
59
  static:
60
- checksum: c1781a09ec4e4c9e2f08a60e662acd8790286ebad62c9d32712a7932d0852a10
61
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-static.tar.gz
60
+ checksum: b7200bf705cdbafad2d62f24554f90a7f317ad9fc4121e9a8a33f36bf1060215
61
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-freebsd-all-static.tar.gz
62
62
  dynamic:
63
- checksum: 0ce479051f5734b330d91811c51813d93e65758ecad97e5f6b9e86764480e7c2
64
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/57a48f4/appsignal-x86_64-freebsd-all-dynamic.tar.gz
63
+ checksum: ff86021f4f6f1fd40cb95ba5a60632954273f9f5dab17d8d45fdd6000acb38d4
64
+ download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ee63235/appsignal-x86_64-freebsd-all-dynamic.tar.gz
data/lib/appsignal/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Appsignal
2
- VERSION = "2.5.0.alpha.1".freeze
2
+ VERSION = "2.5.0.beta.1".freeze
3
3
  end
data/spec/spec_helper.rb CHANGED
@@ -89,6 +89,13 @@ RSpec.configure do |config|
89
89
  # Clean environment
90
90
  appsignal_key_prefixes = %w[APPSIGNAL_ _APPSIGNAL_]
91
91
  env_keys = ENV.keys.select { |key| key.start_with?(*appsignal_key_prefixes) }
92
+ # Always unset the diagnose variable
93
+ # For normal Ruby this is unset in the diagnose task itself, but the jRuby
94
+ # bug requires us to unset it using the method below as well. It's not
95
+ # present in the ENV keys list because it's already cleared in Ruby itself
96
+ # in the diagnose task, so add it manually to the list of to-be cleaned up
97
+ # keys.
98
+ env_keys << "_APPSIGNAL_DIAGNOSE"
92
99
  env_keys.each do |key|
93
100
  # First set the ENV var to an empty string and then delete the key from
94
101
  # the env. We set the env var to an empty string first as jRuby doesn't
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: appsignal
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0.alpha.1
4
+ version: 2.5.0.beta.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Robert Beekman
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-12-12 00:00:00.000000000 Z
12
+ date: 2018-01-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack