pheme 1.2.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a8338f64d87daa837b51db3c2420f7a58b1c90145d269cd4bdf64d95e0e116
-  data.tar.gz: 4fd2cde4cc7738eaaa9c0f53b4372a9be5ff1dfc156667da3254023d3d2211f7
+  metadata.gz: 25e5b03eaaa0be478913538e4421e5275378c906668321593c5691c18f38d2e2
+  data.tar.gz: a0e150bdb3dc2b65072a88f78eaaf60708def769650880b19447dab85f5ff0fb
 SHA512:
-  metadata.gz: 293ff87ae4c74c81100cfffe3e45c62357f33ca48e29c65916e8e4f88026102c9c7caf85ff1599e9362f188d172d955091ac069634de806fb05b68d3f1b7fa58
-  data.tar.gz: 2cae0f28474ab6f5fa1ad7c89662423a0e1c8782d782b1e1e42a0da421d283316518de2eda9d0779f169a295cd777ea7986012be87af2cee1b39e679edc77d3e
+  metadata.gz: f469839d4ffceacbe51de0811c4a9e808adac6f321231aff66f58568c6608315e79aecc3f14a7cb94d128923aa8a0eecfd707d84acf55e8ffe7253fd511ff52d
+  data.tar.gz: 91d340de824254c53ba2eb0b8c63f84f4910c8bda4a746e0a2e7a65573924a54e82e2694c3597f6778914886368d00a110114e71a5bb9432116ad16b2a772ad3

data/.circleci/config.yml

@@ -1,5 +1,21 @@
-# Customized from circle sample rails config here: https://circleci.com/docs/2.0/language-ruby/
+version: 2
+
 references:
+  defaults:
+    2_4_5: &defaults_2_4_5
+      working_directory: ~/wealthsimple
+      docker:
+        - image: circleci/ruby:2.4.5
+          environment:
+            RAILS_ENV: test
+
+    2_5_3: &defaults
+      working_directory: ~/wealthsimple
+      docker:
+        - image: circleci/ruby:2.5.3
+          environment:
+            RAILS_ENV: test
+
   which_bundler: &which_bundler
     run:
       name: Which bundler?
@@ -8,93 +24,123 @@ references:
   bundle_install: &bundle_install
     run:
       name: Bundle Install
-      command: bundle check || bundle install
+      command: bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+  attach_code_workspace: &attach_code_workspace
+    attach_workspace:
+      at: ~/wealthsimple
+
+  restore_bundle_dependencies: &restore_bundle_dependencies
+    run:
+      name: Restore bundle dependencies from workspace
+      command: bundle --path vendor/bundle
 
   run_rspec: &run_rspec
     run:
       name: Run rspec
       command: |
-        bundle exec rspec --profile 10 \
-                          --require spec_helper \
+        bundle exec rspec --require spec_helper \
                           --format RspecJunitFormatter \
                           --out test_results/rspec.xml \
-                          --format documentation \
-                          $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-
-  bundle_audit: &bundle_audit
-    run:
-      name: Bundle audit
-      command: bundle exec bundle-audit update && bundle exec bundle-audit check
+                          --format documentation
 
-version: 2
 jobs:
-  build_2_3_8:
-    working_directory: ~/repo
-    docker:
-      - image: wealthsimple/ruby:2.3.8-node-docker
-        environment:
-          RAILS_ENV: test
+  checkout_and_bundle_2_4_5:
+    <<: *defaults_2_4_5
     steps:
       - checkout
       - *which_bundler
-      - restore_cache:
-          key: v1-ruby-2_3-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
       - *bundle_install
-      - save_cache:
-          key: v1-ruby-2_3-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
-          paths:
-            - vendor/bundle
       - *run_rspec
-      - *bundle_audit
       - store_test_results:
           path: test_results
 
-  build_2_4_5:
-    working_directory: ~/repo
-    docker:
-      - image: wealthsimple/ruby:2.4.5-node-docker
-        environment:
-          RAILS_ENV: test
+  checkout_and_bundle:
+    <<: *defaults
     steps:
       - checkout
       - *which_bundler
-      - restore_cache:
-          key: v1-ruby-2_4-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
       - *bundle_install
-      - save_cache:
-          key: v1-ruby-2_4-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
-          paths:
-            - vendor/bundle
+      - persist_to_workspace:
+          root: .
+          paths: .
+
+  rspec:
+    <<: *defaults
+    steps:
+      - *attach_code_workspace
+      - *restore_bundle_dependencies
       - *run_rspec
-      - *bundle_audit
       - store_test_results:
           path: test_results
 
-  build_2_5_3:
-    working_directory: ~/repo
-    docker:
-      - image: wealthsimple/ruby:2.5.3-node-docker
-        environment:
-          RAILS_ENV: test
+  lint_check:
+    <<: *defaults
+    steps:
+      - *attach_code_workspace
+      - *restore_bundle_dependencies
+      - run: bundle exec rubocop
+
+  vulnerability_check:
+    <<: *defaults
+    steps:
+      - *attach_code_workspace
+      - *restore_bundle_dependencies
+      - run: bundle exec bundle-audit update && bundle exec bundle-audit check
+
+  release:
+    <<: *defaults
     steps:
       - checkout
-      - *which_bundler
-      - restore_cache:
-          key: v1-ruby-2_5--{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
-      - *bundle_install
-      - save_cache:
-          key: v1-ruby-2_5--{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
-          paths:
-            - vendor/bundle
-      - *run_rspec
-      - *bundle_audit
-      - store_test_results:
-          path: test_results
+      - *attach_code_workspace
+      - *restore_bundle_dependencies
+      - run:
+          name: Release to rubygems.org
+          command: |
+            mkdir ~/.gem
+            echo ":rubygems_api_key: ${RUBYGEMS_API_KEY}" >> ~/.gem/credentials
+            chmod 600 ~/.gem/credentials
+            bundle exec rake release
 
 workflows:
   version: 2
   build:
     jobs:
-      - build_2_3_8
-      - build_2_4_5
-      - build_2_5_3
+      - checkout_and_bundle_2_4_5:
+          context: wealthsimple
+      - checkout_and_bundle:
+          context: wealthsimple
+      - rspec:
+          requires:
+            - checkout_and_bundle
+      - lint_check:
+          requires:
+            - checkout_and_bundle
+      - vulnerability_check:
+          requires:
+            - checkout_and_bundle
+      - release:
+          context: wealthsimple
+          filters:
+            branches:
+              only: master
+          requires:
+          - checkout_and_bundle_2_4_5
+          - rspec
+          - lint_check
+          - vulnerability_check
+
+  security-audit:
+    triggers:
+      - schedule:
+          # 11:05 am UTC: 6:05 am EST / 7:05 am EDT
+          cron: "5 11 * * *"
+          filters:
+            branches:
+              only: master
+    jobs:
+      - checkout_and_bundle:
+          context: wealthsimple
+      - vulnerability_check:
+          requires:
+            - checkout_and_bundle

data/.rubocop.yml

@@ -1,143 +1,12 @@
-AllCops:
-  DisplayCopNames: true
+inherit_gem:
+  ws-style:
+    - default.yml
 
+AllCops:
+  # Specify your target Ruby version here (only major/minor versions):
+  TargetRubyVersion: 2.3
   Exclude:
-    - 'vendor/**/*'
-    - 'log/**/*'
-    - 'public/**/*'
-    - 'data/**/*'
-    - 'tmp/**/*'
     - 'bin/**/*'
-    - 'db/**/*'
-    - 'lib/tasks/circle_0.rake' # Ignore circleci code:
-    - 'node_modules/**/*'
-  TargetRubyVersion: 2.3
-
-Lint/AmbiguousOperator:
-  Enabled: false
-
-Naming/FileName:
-  Enabled: false
-
-Lint/IneffectiveAccessModifier:
-  Enabled: false
-
-Lint/UselessAccessModifier:
-  Enabled: false
-
-Layout/SpaceBeforeBlockBraces:
-  Enabled: false
-
-FrozenStringLiteralComment:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-  Max: 120
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Style/For:
-  EnforcedStyle: each
-
-Style/HashSyntax:
-  EnforcedStyle: ruby19
-
-Layout/ExtraSpacing:
-  Enabled: false
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Layout/TrailingBlankLines:
-  EnforcedStyle: final_newline
-
-Naming/VariableName:
-  EnforcedStyle: snake_case
-
-Style/MethodDefParentheses:
-  EnforcedStyle: require_parentheses
-
-Style/Semicolon:
-  AllowAsExpressionSeparator: false
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-Style/AndOr:
-  EnforcedStyle: conditionals
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/CollectionMethods:
-  PreferredMethods:
-    collect: 'map'
-    collect!: 'map!'
-    inject: 'reduce'
-    detect: 'find'
-    find_all: 'select'
-
-Layout/SpaceBeforeFirstArg:
-  Enabled: false
-
-Style/ClassVars:
-  Enabled: false
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Layout/DotPosition:
-  EnforcedStyle: trailing
-
-Style/NumericPredicate:
-  EnforcedStyle: comparison
-
-Layout/IndentHash:
-  EnforcedStyle: consistent
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-Style/Lambda:
-  Enabled: false
-
-Style/SingleLineBlockParams:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/DoubleNegation:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
+    - 'examples/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 3.0.0 - 2019-02-07
+### Changed
+- Renamed gem to pheme, back to open source and published to Rubygems.
+
+## 2.0.1 - 2019-01-03
+### Changed
+- add internal gem spec to test standard gem behavior, reduces unnecessary copy and pasting
+### Fixed
+- namespace for the VERSION constant was incorrectly set to Ws::Ws
+
+## 2.0.0 - 2019-01-03
+### Changed
+- Renamed gem to ws-pheme, **breaking changes** due to new namespace.
+
+## 1.3.1 - 2018-01-02
+### Fixed
+- only pull private gems from private nexus server
+
+## 1.3.0 - 2018-12-31
+### Added
+- publish to private nexus server

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 group :development, :test do
   gem 'bundler-audit', require: false

data/README.md

@@ -1,14 +1,22 @@
-# pheme [![Circle CI](https://circleci.com/gh/wealthsimple/pheme.svg?style=svg)](https://circleci.com/gh/wealthsimple/pheme) [![](https://img.shields.io/gem/v/pheme.svg)](https://rubygems.org/gems/pheme)
+# pheme [![CircleCI](https://circleci.com/gh/wealthsimple/pheme.svg?style=svg&circle-token=76942be0b1712ac066627be264886ee18039ad11)](https://circleci.com/gh/wealthsimple/pheme)
 
 Ruby SNS publisher + SQS poller & message handler
 
-## installation & config
+## Installation
+
+Add this line to your application's `Gemfile`:
 
 ```ruby
-# Gemfile
 gem 'pheme'
 ```
 
+And then execute:
+```bash
+$ bundle
+```
+
+## Configuration
+
 ```ruby
 # Initializer
 aws_config = {

data/Rakefile

@@ -1,3 +1,9 @@
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/pheme/configuration.rb

@@ -17,10 +17,10 @@ module Pheme
 
   class Configuration
     ATTRIBUTES = %i[sns_client sqs_client logger rollbar].freeze
-    attr_accessor *ATTRIBUTES
+    attr_accessor(*ATTRIBUTES)
 
     def initialize
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Logger.new(STDOUT) # rubocop:disable Lint/DisjunctiveAssignmentInConstructor
       @logger = ActiveSupport::TaggedLogging.new(@logger) unless @logger.respond_to?(:tagged)
     end
 

data/lib/pheme/rollbar.rb

@@ -1,5 +1,5 @@
 module Pheme
-  def self.rollbar(exception, message, data={})
+  def self.rollbar(exception, message, data = {})
     return  if configuration.rollbar.nil?
 
     configuration.rollbar.error(exception, message, data)

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = "1.2.2".freeze
+  VERSION = '3.0.0'.freeze
 end

data/pheme.gemspec

@@ -3,34 +3,35 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "pheme/version"
 
-Gem::Specification.new do |gem|
-  gem.name          = "pheme"
-  gem.version       = Pheme::VERSION
-  gem.authors       = ["Peter Graham"]
-  gem.email         = ["peter@wealthsimple.com"]
-  gem.description   = 'Ruby AWS SNS publisher + SQS poller & message handler'
-  gem.summary       = 'Ruby SNS publisher + SQS poller & message handler'
-  gem.homepage      = "https://github.com/wealthsimple/pheme"
+Gem::Specification.new do |s|
+  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless s.respond_to?(:metadata)
 
-  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.licenses      = ["MIT"]
-  gem.required_ruby_version = ">= 2.3.0"
+  s.name          = "pheme"
+  s.version       = Pheme::VERSION
+  s.authors       = ["Peter Graham"]
+  s.email         = ["peter@wealthsimple.com"]
+  s.description   = 'Ruby AWS SNS publisher + SQS poller & message handler'
+  s.summary       = 'Ruby SNS publisher + SQS poller & message handler'
+  s.homepage      = "https://github.com/wealthsimple/pheme"
 
-  gem.add_dependency "activesupport", ">= 4"
-  gem.add_dependency "aws-sdk-sns", "~> 1.1"
-  gem.add_dependency "aws-sdk-sqs", "~> 1.3"
-  gem.add_dependency "recursive-open-struct", "~> 1"
-  gem.add_dependency "smarter_csv", "~> 1"
+  s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
+  s.license       = "MIT"
 
-  gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rake'
+  s.add_dependency "activesupport", ">= 4"
+  s.add_dependency "aws-sdk-sns", "~> 1.1"
+  s.add_dependency "aws-sdk-sqs", "~> 1.3"
+  s.add_dependency "recursive-open-struct", "~> 1"
+  s.add_dependency "smarter_csv", "~> 1"
 
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rspec-collection_matchers"
-  gem.add_development_dependency "rspec-its"
-  gem.add_development_dependency "rspec_junit_formatter", ">= 0", "~> 0.2"
-  gem.add_development_dependency "rubocop"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'git'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-collection_matchers'
+  s.add_development_dependency 'rspec-its'
+  s.add_development_dependency 'rspec_junit_formatter', '~> 0.2'
+  s.add_development_dependency 'ws-style'
 end

data/spec/queue_poller_spec.rb

@@ -55,14 +55,14 @@ describe Pheme::QueuePoller do
       let(:expected_message) do
         [
           { test1: 'value1', test2: 'value2' },
-          { test1: 'value3', test2: 'value4' }
+          { test1: 'value3', test2: 'value4' },
         ]
       end
       let(:message) do
         [
           %w[test1 test2].join(','),
           %w[value1 value2].join(','),
-          %w[value3 value4].join(',')
+          %w[value3 value4].join(','),
         ].join("\n")
       end
 

data/spec/version_spec.rb

@@ -1,5 +1,34 @@
+require 'git'
+
 describe Pheme do
-  it "has a version" do
-    expect(described_class::VERSION).to be_a(String)
+  def get_version(git, branch = 'HEAD')
+    git.grep('VERSION = ', 'lib/*/version.rb', { object: branch })
+        .map { |_sha, matches| matches.first[1] }
+        .map(&method(:parse_version))
+        .reject(&:nil?)
+        .first
+  end
+
+  def parse_version(string)
+    string.match(/VERSION = ['"](.*)['"]/)[1]
+  end
+
+  it 'has a version number' do
+    git = Git.open('.')
+    head_version = get_version(git, 'HEAD')
+    expect(head_version).not_to be_nil
+  end
+
+  it 'has a bumped version' do
+    git = Git.open('.')
+    skip('already on master branch, no need to compare versions') if git.current_branch == 'master'
+
+    head_version = get_version(git, 'HEAD')
+    master_version = get_version(git, 'origin/master')
+
+    raise 'no version.rb file found on the current branch' if head_version.nil?
+    raise 'no version.rb file found on the master branch' if master_version.nil?
+
+    expect(Gem::Version.new(head_version)).to be > Gem::Version.new(master_version)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheme
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,9 +168,6 @@ dependencies:
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
@@ -164,14 +175,11 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: ws-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -197,6 +205,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -238,15 +248,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby SNS publisher + SQS poller & message handler