puppet-autostager 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTc4YTFlMGVhODg4YjcxODdhNjlmNjc5ZGZjNDFmMWRlMTU5MmNkNQ==
-  data.tar.gz: !binary |-
-    YTU4ZmI3YzI2MmFhMjFjNjczNGZmY2E3NzEzNWE2NThjNjUxMzNhOA==
+SHA1:
+  metadata.gz: 643d4cb70e4c30d630b1dc8f2afe4be71fb41a5a
+  data.tar.gz: 8d93af3590162886fa650cc2d29341c12533da9d
 SHA512:
-  metadata.gz: !binary |-
-    YWFlZWE2YmRlYjBkMDk4OTQ0MDVlYWY5OWI0MTAwNjJjMGYzMDAzN2ZlOTMy
-    NmM5MTA4YzYyMzVmNmI0MmY3NTZmNjAxOTA3YWVjZjZjYWYyZWQxYzBlNjI3
-    NzFjNWQ1OTZlMjNiYjhhYmIxZjAzOTcyNTg4M2ZiZjI0YWE5Y2M=
-  data.tar.gz: !binary |-
-    MmMwMmZkZTRhNTYyNmRhMTk3MjU5MWZiZDZmMmNlN2NjZDc4YjBjYzJmMWE5
-    N2JhOTI4YmE2MzQ0NDUyODFhYjJlZjg3ODA5MjQ2NTA3YTQwYmFlYzkxMGQw
-    NzMzYjEzNDg4NDkyMzRhNWIxZGM2YTVhMGJiZjgyYTM2ZjJmNGY=
+  metadata.gz: 1c1f5d203d4c5eebbc4102ff5041bc0383d5dddfbc7cfa8ada9baf13e98851b5bf31f3eb23349123c9293589abd37a19517204886ccc60bb56619b8f419d739c
+  data.tar.gz: 9c7c3cba997137935eeffc3e1692aaf4df3878ecb215b7ade94a10f5d9d9a0794f281413c28d08a774c4de2eddb0a0969449605cc127bed3a73cc9c926b1a46a

data/.rubocop.yml

@@ -1,5 +1,14 @@
 ---
+AllCops:
+  Exclude:
+    - 'Dockerfile*'
 
 # Avoid diff-churn!
-Style/TrailingComma:
+Style/TrailingCommaInArguments:
+  Description: 'Checks for trailing comma in argument lists.'
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInLiteral:
+  Description: 'Checks for trailing comma in array and hash literals.'
+  Enabled: true
   EnforcedStyleForMultiline: comma

data/Gemfile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in autostager.gemspec

data/Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # vim: set ts=2 sw=2 ai et:
 
 # Does the current user have root privileges?
@@ -32,10 +31,10 @@ end
 
 # Run unit tests before functional tests.
 desc 'Run rspec tests'
-task test: [
-  :rubocop,
-  :unit,
-  :functional,
+task test: %i[
+  rubocop
+  unit
+  functional
 ]
 
 RSpec::Core::RakeTask.new(:unit) do |t|

data/autostager.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'English'
@@ -15,12 +14,11 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($RS)
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)\/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'friction'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'rake'

data/bin/autostager

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 
 $LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
 

data/circle.yml

@@ -1,7 +1,9 @@
 machine:
+  ruby:
+    version: 2.4.0
   environment:
     # If you change this, you need to change lib/autostager/version.rb
-    VERSION: 0.0.10
+    VERSION: 0.0.11
 
 test:
   post:

data/lib/autostager.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'English'
 require 'fileutils'
 require 'autostager/cli'
@@ -11,6 +10,7 @@ require 'octokit'
 require 'pp'
 
 # Top-level module namespace.
+# rubocop:disable Metrics/ModuleLength
 module Autostager
   module_function
 
@@ -25,9 +25,15 @@ module Autostager
     a_string.gsub(/[^a-z0-9_]/i, '_')
   end
 
-  # rubocop:disable MethodLength
+  # Get the name of the default branch for the repo.
+  # This is usually master in git, but
+  # could also be "production" for a puppet repo.
+  def default_branch
+    @client.repo(repo_slug).default_branch
+  end
+
+  # rubocop:disable MethodLength,Metrics/AbcSize
   def stage_upstream
-    default_branch = @client.repo(repo_slug).default_branch
     log "===> begin #{default_branch}"
     p = Autostager::PullRequest.new(
       default_branch,
@@ -47,9 +53,9 @@ module Autostager
       ':bangbang: This probably means somebody force-pushed to the branch.',
     )
   end
-  # rubocop:enable MethodLength
+  # rubocop:enable MethodLength,Metrics/AbcSize
 
-  # rubocop:disable MethodLength
+  # rubocop:disable MethodLength,Metrics/AbcSize
   def process_pull(pr)
     log "===> #{pr.number} #{clone_dir(pr)}"
     p = Autostager::PullRequest.new(
@@ -74,9 +80,9 @@ module Autostager
       comment_or_close(p, pr)
     end
   end
-  # rubocop:enable MethodLength
+  # rubocop:enable MethodLength,Metrics/AbcSize
 
-  # rubocop:disable MethodLength
+  # rubocop:disable MethodLength,Metrics/AbcSize
   def comment_or_close(p, pr, add_comment = true)
     if p.up2date?("upstream/#{pr.base.repo.default_branch}")
       if add_comment
@@ -100,7 +106,7 @@ module Autostager
       log comment
     end
   end
-  # rubocop:enable MethodLength
+  # rubocop:enable MethodLength,Metrics/AbcSize
 
   def authenticated_url(s)
     s.dup.sub!(%r{^(https://)(.*)}, '\1' + access_token + '@\2')
@@ -130,7 +136,7 @@ module Autostager
     result = 120
     if ENV.key?('timeout')
       result = ENV['timeout'].to_i
-      fail 'timeout must be greater than zero seconds' if result <= 0
+      raise 'timeout must be greater than zero seconds' if result <= 0
     end
     result
   end
@@ -144,7 +150,7 @@ module Autostager
     ]
   end
 
-  # rubocop:disable MethodLength
+  # rubocop:disable MethodLength,Metrics/AbcSize
   def run
     Octokit.auto_paginate = true
     user = client.user
@@ -178,5 +184,6 @@ module Autostager
     $stderr.puts 'Did you export "access_token" and "repo_slug"?'
     exit(1)
   end
-  # rubocop:enable MethodLength
+  # rubocop:enable MethodLength,Metrics/AbcSize
 end
+# rubocop:enable Metrics/ModuleLength

data/lib/autostager/cli.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'autostager/logger'
 
 module Autostager

data/lib/autostager/git_timeout.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Autostager
   # Convenience class for exception-handling.
   class GitTimeout < StandardError; end

data/lib/autostager/logger.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'syslog'
 
 module Autostager

data/lib/autostager/pull_request.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Autostager
   # Convenience class to represent a PR in staging directory.
   class PullRequest

data/lib/autostager/timeout.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Autostager
   # Meta-module to call the correct library method
   # for the version of Ruby on which the autostager runs.
@@ -16,6 +14,7 @@ module Autostager
     # @param block [Block] Code that is subject to expiration.
     #
     # @return [nil]
+    # rubocop:disable Performance/RedundantBlockCall
     def timeout(seconds, err, &block)
       if RUBY_VERSION =~ /1.8/
         require 'system_timer'
@@ -25,5 +24,6 @@ module Autostager
         ::Timeout.timeout(seconds, err) { block.call }
       end
     end
+    # rubocop:enable Performance/RedundantBlockCall
   end
 end

data/lib/autostager/version.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # Version constant for the gem.
 #
 # If you change this, you need to also change circle.yaml
 module Autostager
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'.freeze
 end

data/script/push.sh

@@ -1,14 +1,20 @@
-#!/bin/bash
+#!/bin/sh
+set -e
+set -u
 
+mkdir -p ~/.gem/ || :
 cp -f templates/credentials ~/.gem/
 chmod 0600 ~/.gem/credentials
 sed -i "s/API_KEY/${API_KEY}/" ~/.gem/credentials
 
-gem search --remote -a puppet-autostager | grep ${VERSION}
-if [[ $? -eq 0 ]]; then
+output="$(gem search --remote -a puppet-autostager)"
+if echo ${output} | grep ${VERSION}; then
   # Be informative, but don't fail.
   # This enables to merge changes to non-gem files, such as README.
   echo "puppet-autostager ${VERSION} has already been published."
 else
-  gem push puppet-autostager-${VERSION}.gem
+  gem push puppet-autostager-${VERSION}.gem || {
+    echo ERR: failed to push gem
+    exit 1
+  } >&2
 fi

data/spec/functional/placeholder_spec.rb

@@ -1,3 +1,2 @@
-# encoding: utf-8
 # Ensure rake finds something in this directory
 # to avoid running unit tests twice.

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest'
 require 'mocha/setup'
 require 'English'
@@ -14,7 +13,7 @@ RSpec.configure do |c|
   # Allow both "should" and "expect" syntax.
   # https://www.relishapp.com/rspec/rspec-expectations/docs/syntax-configuration
   c.expect_with :rspec do |e|
-    e.syntax = [:should, :expect]
+    e.syntax = %i[should expect]
   end
 
   # Fail overall as soon as first test fails.

data/spec/unit/autostager_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Autostager do

data/src/publish

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+set -u
+
+. vars
+
+mkdir -p ~/.gem/ || :
+cp -f credentials ~/.gem/
+chmod 0600 ~/.gem/credentials
+sed -i "s/API_KEY/${API_KEY}/" ~/.gem/credentials
+
+output="$(gem search --remote -a puppet-autostager)"
+if echo ${output} | grep ${VERSION}; then
+  # Be informative, but don't fail.
+  # This enables to merge changes to non-gem files, such as README.
+  echo "puppet-autostager ${VERSION} has already been published."
+else
+  gem push puppet-autostager-${VERSION}.gem || {
+    echo ERR: failed to push gem
+    exit 1
+  } >&2
+fi

metadata

@@ -1,201 +1,187 @@
 --- !ruby/object:Gem::Specification
 name: puppet-autostager
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Paul Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: friction
-  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: minitest
   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: mocha
   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
     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: rspec-core
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   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: rspec-mocks
   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: rubocop
   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: thor
   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: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Create a puppet enviroment for each pull request
@@ -206,9 +192,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .editorconfig
-- .gitignore
-- .rubocop.yml
+- ".editorconfig"
+- ".gitignore"
+- ".rubocop.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -232,7 +218,7 @@ files:
 - spec/functional/placeholder_spec.rb
 - spec/spec_helper.rb
 - spec/unit/autostager_spec.rb
-- spec/unit/friction_spec.rb
+- src/publish
 - templates/credentials
 homepage: https://github.com/jumanjiman/autostager
 licenses:
@@ -244,17 +230,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Create a puppet enviroment for each pull request
@@ -262,4 +248,3 @@ test_files:
 - spec/functional/placeholder_spec.rb
 - spec/spec_helper.rb
 - spec/unit/autostager_spec.rb
-- spec/unit/friction_spec.rb

data/spec/unit/friction_spec.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'friction'
-require 'stringio'
-
-# Monkey-patch kernel to capture stdout
-# as workaround for friction gem. bleh.
-#
-# @todo submit PR against friction.
-module Kernel
-  def capture_stdout
-    real_out, out = $stdout, StringIO.new
-    $stdout = out
-    yield
-    return out.string
-  ensure
-    $stdout = real_out
-  end
-end
-
-describe 'contributor friction' do
-  it 'there should not be any' do
-    out = capture_stdout { Friction.run! }
-    out.should =~ /Everything is in order/
-  end
-end