recurly 3.3.0 → 3.6.0

data/recurly.gemspec

@@ -14,6 +14,14 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/recurly/recurly-client-ruby"
   spec.license = "MIT"
 
+  spec.metadata = {
+    "bug_tracker_uri" => "#{spec.homepage}/issues",
+    "changelog_uri" => "#{spec.homepage}/blob/master/CHANGELOG.md",
+    "documentation_uri" => "https://dev.recurly.com/docs",
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => "#{spec.homepage}/tree/#{spec.version}",
+  }
+
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -21,11 +29,8 @@ Gem::Specification.new do |spec|
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", ">= 0.8.11", "< 1.0.0"
-
-  spec.add_development_dependency "net-http-persistent", "~> 2.9.4"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard", "~> 0.9"
   spec.add_development_dependency "pry", "~> 0.10"

data/scripts/bump

@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
 set -e
 
-bump2version "$@"
+if [ "$1" == "--next-version" ]; then
+  shift
+  bump2version --dry-run --list "$@" | grep new_version | cut -d "=" -f 2
+elif [ "$1" == "--this-version" ]; then
+  grep current_version .bumpversion.cfg | awk -F" = " '{print $2}'
+else
+  bump2version "$@"
+fi

data/scripts/changelog

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+
+if [ -z "$GITHUB_TOKEN" ]; then
+  echo "Environment variable GITHUB_TOKEN must be set"
+else
+  if [ "$1" == "--pending" ]; then
+    github_changelog_generator -t $GITHUB_TOKEN --unreleased-only -o "$2"
+  elif [ "$1" == "--release-tag" ]; then
+    github_changelog_generator -t $GITHUB_TOKEN --unreleased true --unreleased-label "$2"
+  else
+    github_changelog_generator -t $GITHUB_TOKEN
+  fi
+fi

data/scripts/format

@@ -1,8 +1,12 @@
 #!/usr/bin/env bash
-set -e
 
 if [ "$1" == "--check" ]; then
   ./bin/rufo . --check
+  RESULT=$?
+  if [ $RESULT != 0 ]; then
+    echo "Code is not properly formatted. Please execute ./scripts/format to autoformat the code."
+    exit $RESULT
+  fi
 else
   ./bin/rufo . -x
 fi

data/scripts/prepare-release

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -e
+
+# major,minor,patch
+PART=${1}
+NEXT_VERSION=$(./scripts/bump --next-version "$PART")
+UNRELEASED_LOG="/tmp/ruby-pending-changes.md"
+
+if [ -z "$NEXT_VERSION" ]; then
+  echo "Failed to get next version"
+else
+  # Generate pending changes in tmpfile
+  ./scripts/changelog --pending $UNRELEASED_LOG
+  # Add a git message header of Release X.Y.Z
+  printf "Release %s\n\n$(cat $UNRELEASED_LOG)" "$NEXT_VERSION" > $UNRELEASED_LOG
+  # Delete credit line
+  sed -i '' -e '$ d' $UNRELEASED_LOG
+
+  git checkout -b "release-$NEXT_VERSION"
+
+  # Actually bump the version
+  ./scripts/bump "$PART"
+
+  # Rebuild docs
+  ./scripts/build
+
+  # Make the commit
+  git add . --all
+  git commit -F "$UNRELEASED_LOG"
+
+  # Push up this branch for PR
+  git push origin "release-$NEXT_VERSION"
+
+  # Create PR
+  hub pull-request -c -F "$UNRELEASED_LOG"
+fi

data/scripts/release

@@ -1,11 +1,32 @@
 #!/usr/bin/env bash
 set -e
 
-# Clean up any leftover gems
-rm -f *.gem
+# TODO this file could be gone
+RELEASED_LOG="/tmp/ruby-pending-changes.md"
+THIS_VERSION=$(./scripts/bump --this-version)
+
+# Generate the changelog with changes in this release
+./scripts/changelog --release-tag "$THIS_VERSION"
+git add CHANGELOG.md
+git commit -m "Update Changelog for Release $THIS_VERSION"
+git push origin master
 
+# publish
+# Clean up any leftover gems
+rm -f ./*.gem
 # Build the new gem
 gem build recurly.gemspec
-
 # Push what should be the only gem present
-gem push *.gem
+gem push ./*.gem
+
+# create release
+hub release create -c -F "$RELEASED_LOG" "$THIS_VERSION"
+
+# Copy-pasteable messages for announcments
+echo ":ruby: Ruby $THIS_VERSION Released :ruby:"
+echo ":rubygems: Rubygems:  https://rubygems.org/gems/recurly/versions/$THIS_VERSION"
+echo "Release: https://github.com/recurly/recurly-client-ruby/releases/tag/$THIS_VERSION"
+echo "Changelog:"
+echo "\`\`\`"
+cat "$RELEASED_LOG"
+echo "\`\`\`"

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.11
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.11
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: net-http-persistent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -152,10 +118,13 @@ files:
 - ".bumpversion.cfg"
 - ".github/ISSUE_TEMPLATE/bug-report.md"
 - ".github/ISSUE_TEMPLATE/question-or-other.md"
+- ".github/workflows/docs.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - GETTING_STARTED.md
 - Gemfile
@@ -166,8 +135,8 @@ files:
 - lib/data/ca-certificates.crt
 - lib/recurly.rb
 - lib/recurly/client.rb
-- lib/recurly/client/adapter.rb
 - lib/recurly/client/operations.rb
+- lib/recurly/connection_pool.rb
 - lib/recurly/errors.rb
 - lib/recurly/errors/api_errors.rb
 - lib/recurly/errors/network_errors.rb
@@ -192,6 +161,7 @@ files:
 - lib/recurly/requests/coupon_update.rb
 - lib/recurly/requests/custom_field.rb
 - lib/recurly/requests/external_refund.rb
+- lib/recurly/requests/external_transaction.rb
 - lib/recurly/requests/invoice_address.rb
 - lib/recurly/requests/invoice_collect.rb
 - lib/recurly/requests/invoice_create.rb
@@ -212,6 +182,7 @@ files:
 - lib/recurly/requests/shipping_fee_create.rb
 - lib/recurly/requests/shipping_purchase.rb
 - lib/recurly/requests/subscription_add_on_create.rb
+- lib/recurly/requests/subscription_add_on_tier.rb
 - lib/recurly/requests/subscription_add_on_update.rb
 - lib/recurly/requests/subscription_cancel.rb
 - lib/recurly/requests/subscription_change_create.rb
@@ -223,6 +194,7 @@ files:
 - lib/recurly/requests/subscription_shipping_purchase.rb
 - lib/recurly/requests/subscription_shipping_update.rb
 - lib/recurly/requests/subscription_update.rb
+- lib/recurly/requests/tier.rb
 - lib/recurly/resource.rb
 - lib/recurly/resources.rb
 - lib/recurly/resources/account.rb
@@ -273,9 +245,11 @@ files:
 - lib/recurly/resources/site.rb
 - lib/recurly/resources/subscription.rb
 - lib/recurly/resources/subscription_add_on.rb
+- lib/recurly/resources/subscription_add_on_tier.rb
 - lib/recurly/resources/subscription_change.rb
 - lib/recurly/resources/subscription_shipping.rb
 - lib/recurly/resources/tax_info.rb
+- lib/recurly/resources/tier.rb
 - lib/recurly/resources/transaction.rb
 - lib/recurly/resources/transaction_error.rb
 - lib/recurly/resources/transaction_payment_gateway.rb
@@ -293,14 +267,21 @@ files:
 - recurly.gemspec
 - scripts/build
 - scripts/bump
+- scripts/changelog
 - scripts/clean
 - scripts/format
+- scripts/prepare-release
 - scripts/release
 - scripts/test
 homepage: https://github.com/recurly/recurly-client-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/recurly/recurly-client-ruby/issues
+  changelog_uri: https://github.com/recurly/recurly-client-ruby/blob/master/CHANGELOG.md
+  documentation_uri: https://dev.recurly.com/docs
+  homepage_uri: https://github.com/recurly/recurly-client-ruby
+  source_code_uri: https://github.com/recurly/recurly-client-ruby/tree/3.6.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -316,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The ruby client for Recurly's V3 API

data/lib/recurly/client/adapter.rb

@@ -1,39 +0,0 @@
-require "openssl"
-
-module Recurly
-  class Client
-    module NetHttpPersistentAdapter
-      protected
-
-      def configure_net_adapter(faraday)
-        faraday.adapter :net_http_persistent do |http|
-          # yields Net::HTTP::Persistent
-          # for net-http-persistent 2.X, alternative is for 3.X
-          if http.respond_to? :keep_alive_timeout
-            http.keep_alive_timeout = 60
-          else
-            http.keep_alive = 60
-          end
-        end
-      end
-    end
-
-    module NetHttpAdapter
-      protected
-
-      def configure_net_adapter(faraday)
-        faraday.adapter :net_http do |http|
-          # yields Net::HTTP
-        end
-      end
-    end
-
-    include NetHttpAdapter
-
-    begin
-      require "net/http/persistent"
-      include NetHttpPersistentAdapter
-    rescue LoadError
-    end
-  end
-end