circlemator 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e499cf49cb667491cdbcc4461f803a915c4f723c3724ce6190560151612b1e
-  data.tar.gz: 3d7593e004adc53e015691940feff6db04535863bc980e8f64c49a59302d54c0
+  metadata.gz: 9f7dd98e5d8ec606b4b65aa1439f4030aa16a31b95483196cc74c04c52ed13a6
+  data.tar.gz: c0316444467344ebdf8135a26a46c20aba0ed906d1c35a4fb37f29895d4c4bf3
 SHA512:
-  metadata.gz: 07657c548b74615461d3a50cd7472503338d519d6a737141b21383ae10d5dbfa80ef4c656d86be50b48bc484c1fcfab6a1dbd11f02782332f7166fc5d36f0116
-  data.tar.gz: 8490f8c638ec58e9ca01ba1d09473b543c36f2ddfbb5366266fd03fe5927a27bf358e0c35daf06e76a6858306c519022f1a4ec8db6b84db55e470bec1020db0f
+  metadata.gz: 04cd0aa984b94d5cb85ec994c6f3f59fbef36bfcce1bad8f4396e43ae89796e2de15611b73f547b740eb14d3cd2aed6b24945f101dac878da537f9632f6b22a2
+  data.tar.gz: 9af2ccd3b73ec05634aba0e851d56346150dd3aa09b4a5fe8075f422cf6f65c1e0cf9c1bb190203e076d271b66395f544a0f669f6872212e6f7277545c24cfc0

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   test:
     docker:
-      - image: circleci/ruby:2.4.2
+      - image: circleci/ruby:2.5
     steps:
       - checkout
       - run:
@@ -17,6 +17,7 @@ jobs:
           command: |
             sudo apt-get update
             sudo apt-get install cmake pkg-config
+            gem install bundler
       - restore_cache:
           key: v1-rainforest-bundler-{{ checksum "Gemfile.lock" }}
       - run:
@@ -44,7 +45,7 @@ jobs:
           command: bundle exec exe/circlemator test-security --base-branch=master
   push_to_rubygems:
     docker:
-      - image: circleci/ruby:2.4.2
+      - image: circleci/ruby:2.5
     steps:
       - checkout
       - run:

data/.ruby-version

@@ -1 +1 @@
-2.4.2
+2.5.3

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4.2-jessie
+FROM ruby:2.5
 RUN apt-get update -y && apt-get install -y cmake
 
 # Set default locale for Ruby to avoid encoding errors
@@ -6,6 +6,14 @@ ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
 WORKDIR /app
+
+RUN gem update --system
+RUN gem install bundler
+
 COPY . .
 RUN bundle install
+
+# makes the circlemator binstub accessible outside this bundle
+RUN rake install:local
+
 ENTRYPOINT ["circlemator"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    circlemator (0.4.2)
+    circlemator (0.6.0)
       httparty (~> 0.13.7)
       pronto (~> 0.9.5)
       pronto-brakeman (~> 0.9.1)
@@ -15,57 +15,57 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    brakeman (4.3.1)
+    brakeman (4.5.1)
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.3.1)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
+    ffi (1.10.0)
     formatador (0.2.5)
     gitlab (4.3.0)
       httparty
       terminal-table
-    guard (2.14.1)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.5)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.6)
+    hashdiff (0.3.8)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    imagen (0.1.5)
+    imagen (0.1.8)
       parser (>= 2.5, != 2.5.1.1)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     json (1.8.6)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.9.0)
+    lumberjack (1.0.13)
+    method_source (0.9.2)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.13.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.12.1)
-    parser (2.5.1.2)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pronto (0.9.5)
@@ -78,25 +78,25 @@ GEM
     pronto-brakeman (0.9.1)
       brakeman (>= 3.2.0)
       pronto (~> 0.9.0)
-    pronto-commentator (0.1.1)
+    pronto-commentator (0.1.2)
       pronto (~> 0.9.5)
     pronto-rubocop (0.9.1)
       pronto (~> 0.9.0)
       rubocop (~> 0.50, >= 0.49.1)
-    pronto-undercover (0.1.2)
-      pronto (~> 0.9.0)
-      undercover (~> 0.2.0)
-    pry (0.11.1)
+    pronto-undercover (0.1.4)
+      pronto (>= 0.9, < 0.11)
+      undercover (~> 0.3.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
     rainbow (2.2.2)
       rake
     rake (10.5.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rf-stylez (0.2.10)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rf-stylez (0.2.21)
       rubocop (~> 0.59.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -111,7 +111,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rspec_junit_formatter (0.3.0)
+    rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.59.2)
       jaro_winkler (~> 1.5.1)
@@ -123,8 +123,8 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
-    rugged (0.27.5)
-    safe_yaml (1.0.4)
+    rugged (0.28.1)
+    safe_yaml (1.0.5)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
@@ -138,13 +138,13 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
-    undercover (0.2.1)
-      imagen (~> 0.1.5)
-      rainbow (~> 2.1)
-      rugged (~> 0.27.0)
-    unicode-display_width (1.4.0)
-    vcr (3.0.3)
-    webmock (1.22.6)
+    undercover (0.3.2)
+      imagen (~> 0.1)
+      rainbow (>= 2.1, < 4.0)
+      rugged (>= 0.27, < 0.29)
+    unicode-display_width (1.5.0)
+    vcr (4.0.0)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -155,7 +155,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.9)
   circlemator!
-  guard-rspec (~> 4.6.4)
+  guard-rspec (~> 4.7.3)
   rake (~> 10.0)
   rf-stylez
   rspec (~> 3.4.0)
@@ -164,8 +164,8 @@ DEPENDENCIES
   simplecov
   simplecov-html
   simplecov-lcov
-  vcr (~> 3.0.1)
-  webmock (~> 1.22.6)
+  vcr (~> 4.0.0)
+  webmock (~> 3.5.1)
 
 BUNDLED WITH
-   1.17.1
+   2.0.2

data/README.md

@@ -5,44 +5,30 @@ used internally at [Rainforest QA](http://www.rainforestqa.com).
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'circlemator', require: false
-```
-
-Then run `bundle` and check in the resulting Gemfile.lock. That should
-be enough, really.
+Install the docker image with `docker pull rainforestapp/circlemator`.
 
 ## Usage
 
-Circlemator tasks are designed to be added to your circle.yml file
-like so:
-
-```yml
-- bundle exec circlemator <task> [options]
 ```
-
-Different tasks require different options/placement in your
-circle.yml.
+docker run rainforestapp/circlemator style-check --base-branch=develop
+docker run rainforestapp/circlemator test-coverage --base-branch=develop
+docker run rainforestapp/circlemator test-security --base-branch=develop
+docker run rainforestapp/circlemator self-merge --base-branch=master --compare-branch=develop
+docker run rainforestapp/circlemator cancel-old
+docker run rainforestapp/circlemator comment 'A totally unnecessary comment' --base-branch=develop
+```
 
 ## Tasks
 
-### Cancel old builds
+### Cancel old builds (`cancel-old`)
 
 CircleCI starts a build every time you push to Github. That's usually
 a good thing, but if you have a big test suite it can be annoying when
 your build queue gets gummed up running builds on out-of-date
 commits. To clear things up, the `cancel-old` task cancels all builds
 that are not at the head of their branch. It should be in your
-circle.yml before your tests are run but after the dependencies have
-been fetched, for example:
-
-```yml
-test:
-  pre:
-    - bundle exec circlemator cancel-old
-```
+`circle.yml` before your tests are run but after the dependencies have
+been fetched.
 
 In order for this to work, you need the following environment variable
 to be set in CircleCI:
@@ -50,14 +36,12 @@ to be set in CircleCI:
 - `CIRCLE_API_TOKEN`: Your CircleCI API token. (Can also be set with
   the `-t` option.)
 
-### Comment
+### Comment (`comment`)
 
 You can comment on the open PR using the `comment` command:
 
-```yml
-test:
-  post:
-    - bundle exec circlemator comment 'A totally unnecessary comment' --base-branch=develop
+```
+docker run rainforestapp/circlemator comment 'A totally unnecessary comment' --base-branch=develop
 ```
 
 ### Style check
@@ -67,10 +51,8 @@ linters/checkers TBD) and comments on the Github pull request using
 the excellent [Pronto](https://github.com/prontolabs/pronto). Use it
 like so:
 
-```yml
-test:
-  pre:
-    - bundle exec circlemator style-check --base-branch=develop
+```
+docker run rainforestapp/circlemator style-check --base-branch=develop
 ```
 
 (Note: use local branch names, like `develop` instead of
@@ -119,10 +101,8 @@ require 'your_app'
 
 Then use it like this:
 
-```yml
-test:
-  post:
-    - bundle exec circlemator test-coverage --base-branch=develop
+```
+docker run rainforestapp/circlemator test-coverage --base-branch=develop
 ```
 
 Circlemator reads additional config from [.pronto.yml](https://github.com/grodowski/pronto-undercover#configuring)
@@ -136,20 +116,18 @@ Circlemator reads additional config from [.pronto.yml](https://github.com/grodow
 
 The security check looks for common security errors using [Pronto](https://github.com/prontolabs/pronto) and [Brakeman](https://github.com/presidentbeef/brakeman) Static Application Security Testing and post warnings as PR comments.
 
-```yml
-test:
-  pre:
-    - bundle exec circlemator security-check --base-branch=develop
+```
+docker run rainforestapp/circlemator test-security --base-branch=develop
 ```
 
 (Note: use local branch names, like `develop` instead of
 `origin/develop`; `origin` will be prepended for running pronto as
 necessary.)
 
-It probably makes sense to put `security-check` in either the `pre` or
+It probably makes sense to put `test-security` in either the `pre` or
 `override` steps.)
 
-`security-check` requires the following environment variable to be set:
+`test-security` requires the following environment variable to be set:
 
 - `GITHUB_ACCESS_TOKEN`: A Github API auth token for a user with commit
   access to your repo. (Can also be set with the `-g` option.)
@@ -161,27 +139,17 @@ looks like this:
 
 1. Push to feature branch pull request.
 2. Run unit tests and get code review (repeat 1-2 as necessary).
-3. Merge feature branch to `develop`.
-4. Open release pull request from `develop` to `master`.
-5. Run unit tests + [Rainforest](http://www.rainforestqa.com) against `develop`.
-6. Merge `develop` into `master` if everything's green.
-7. Deploy from `master`.
+3. Merge feature branch to `master`.
+4. Deploy from `master`.
 
-Out of these, steps 1, 2, 3, and 4 require manual intervention, but
-everything else should be automatic! The `self-merge` task is designed
-to take care of step 6 (the rest is handled by CircleCI out of the
-box).
+Out of these, steps 1, 2, and 3 require manual intervention, but
+everything else should be automatically handled by CircleCI!
 
 To use `self-merge`, add something like the following to your
 circle.yml:
 
 ```yml
-deployment:
-  staging:
-    branch: develop
-    commands:
-      <any commands you would normally run>
-      - bundle exec circlemator self-merge --base-branch=master --compare-branch=develop
+docker run rainforestapp/circlemator self-merge --base-branch=master --compare-branch=develop
 ```
 
 Swap out `develop` and `master` as necessary to fit your workflow. Be
@@ -210,5 +178,5 @@ https://github.com/rainforestapp/circlemator.
 
 ### Releasing
 
-- Make sure you're an owner on rubygems.org
-- `rake release`
+Merge to master, Docker will build a new docker image and release it on Docker
+hub at https://hub.docker.com/r/rainforestapp/circlemator/

data/circlemator.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '>= 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'vcr', '~> 3.0.1'
-  spec.add_development_dependency 'webmock', '~> 1.22.6'
+  spec.add_development_dependency 'vcr', '~> 4.0.0'
+  spec.add_development_dependency 'webmock', '~> 3.5.1'
   spec.add_development_dependency 'rspec', '~> 3.4.0'
-  spec.add_development_dependency 'guard-rspec', '~> 4.6.4'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-html'
   spec.add_development_dependency 'simplecov-lcov'

data/exe/circlemator

@@ -9,7 +9,7 @@ require_relative '../lib/circlemator/pr_commenter'
 
 options = {}
 parser = OptionParser.new do |opts|
-  opts.banner = 'Usage: circlemator (self-merge|cancel-old|comment) [text] [options]'
+  opts.banner = 'Usage: circlemator (self-merge|cancel-old|comment|test-coverage|test-security|style-check) [text] [options]'
 
   opts.on('-bBRANCH', '--base-branch=BRANCH', 'Base branch for merging') do |b|
     options[:base_branch] = b

data/lib/circlemator/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Circlemator
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circlemator
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Emanuel Evans
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.6
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.6
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -285,8 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A bucket of tricks for CircleCI and Github.