ansible-wrapper 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e5caf4e2e2b9582a3d4440288160b30e51895cab153c2cb6194fcc38f682144
-  data.tar.gz: fc87385c8a099a7fb357a9d89a2b21c024dffa0534861b4afa9165def73d30cb
+  metadata.gz: 6e35370e56d2b0876cbfda0e4882a200ef13a264b7a69ddbdec2a7ce6d35b454
+  data.tar.gz: ad30a73f31c1502a9ae1180be242f5578dee582996d27a2cad523bce7fb6babf
 SHA512:
-  metadata.gz: ed22098776f0eb16adcf65707310e85c982d04a050505d0ffcfb8fb701ccce106f665d1bf6710bf25f738c41e650e32ca404f958304bd0c97bcacf858030db6f
-  data.tar.gz: 1d1ae31bbfd9cc8c4f1453bebc24d47a9a2e29496cf27efd924e6c3ec567e97becc489319aee5fe9bfe3752c180199b22574cb737d2c668eb728734bda7ff4c1
+  metadata.gz: 6cf8972c31e77a3b336c13ba884472c17b250adb18d797487a049beafbe0d55bd9fd616e83e22be6cbc2e42505011b048b215358f3a8b9c3b8a32e8a20c02a64
+  data.tar.gz: fc671344ebdee92cdec17d2cb823f40cecdf217f3b81dcd16f01d263bb878537b551fd810079264fb3d997dce20d38020ae758828fe87e391bcaae95e65d08f9

data/.github/workflows/test_via_docker.yml

@@ -8,9 +8,10 @@ jobs:
     strategy:
       matrix:
         ansible:
-          - 2.8.5
-          - 2.7.12
-          - 2.6.19
+          - 2.9.6
+          - 2.8.10
+          - 2.7.16
+          - 2.6.20
           - 2.5.15
           - 2.4.6
           - 2.3.3
@@ -19,30 +20,38 @@ jobs:
           - 2.0.2
     steps:
       - uses: actions/checkout@v1
-      - name: Test against Ruby 2.6.4
+      - name: Test against Ruby 2.7.0
         env:
-          RUBY_VERSION: 2.6.4
+          RUBY_VERSION: 2.7.0
           ANSIBLE_VERSION: ${{ matrix.ansible }}
         run: >
           docker run --rm -v $PWD:/app pgeraghty/ansible-ruby:$RUBY_VERSION-$ANSIBLE_VERSION
-          /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 &&
+          /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 &&
           COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }} COVERALLS_RUN_LOCALLY=true bundle exec rake"
 
-      - name: Test against Ruby 2.5.6
+      - name: Test against Ruby 2.6.5
         env:
-          RUBY_VERSION: 2.5.6
+          RUBY_VERSION: 2.6.5
           ANSIBLE_VERSION: ${{ matrix.ansible }}
         run: >
           docker run --rm -v $PWD:/app pgeraghty/ansible-ruby:$RUBY_VERSION-$ANSIBLE_VERSION
-          /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+          /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 && bundle exec rake"
 
-      - name: Test against Ruby 2.4.7
+      - name: Test against Ruby 2.5.7
         env:
-          RUBY_VERSION: 2.4.7
+          RUBY_VERSION: 2.5.7
           ANSIBLE_VERSION: ${{ matrix.ansible }}
         run: >
           docker run --rm -v $PWD:/app pgeraghty/ansible-ruby:$RUBY_VERSION-$ANSIBLE_VERSION
-          /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+          /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+
+      - name: Test against Ruby 2.4.9
+        env:
+          RUBY_VERSION: 2.4.9
+          ANSIBLE_VERSION: ${{ matrix.ansible }}
+        run: >
+          docker run --rm -v $PWD:/app pgeraghty/ansible-ruby:$RUBY_VERSION-$ANSIBLE_VERSION
+          /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 && bundle exec rake"
 
       - name: Test against Ruby 2.3.7
         env:
@@ -50,7 +59,7 @@ jobs:
           ANSIBLE_VERSION: ${{ matrix.ansible }}
         run: >
           docker run --rm -v $PWD:/app pgeraghty/ansible-ruby:$RUBY_VERSION-$ANSIBLE_VERSION
-          /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+          /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 && bundle exec rake"
 
       - name: Test against Ruby 2.2.7
         env:
@@ -58,7 +67,7 @@ jobs:
           ANSIBLE_VERSION: ${{ matrix.ansible }}
         run: >
           docker run --rm -v $PWD:/app pgeraghty/ansible-ruby:$RUBY_VERSION-$ANSIBLE_VERSION
-          /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+          /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 && bundle exec rake"
 
       - name: Test against Ruby 2.1.10
         env:
@@ -66,4 +75,4 @@ jobs:
           ANSIBLE_VERSION: ${{ matrix.ansible }}
         run: >
           docker run --rm -v $PWD:/app pgeraghty/ansible-ruby:$RUBY_VERSION-$ANSIBLE_VERSION
-          /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+          /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 && bundle exec rake"

data/.travis.yml

@@ -2,25 +2,36 @@ language: bash
 services:
   - docker
 env:
-  - ANSIBLE_VERSION=2.8.5
-  - ANSIBLE_VERSION=2.7.12
-  - ANSIBLE_VERSION=2.6.19
-  - ANSIBLE_VERSION=2.5.15
-  - ANSIBLE_VERSION=2.4.6
-  - ANSIBLE_VERSION=2.3.3
-  - ANSIBLE_VERSION=2.2.3
-  - ANSIBLE_VERSION=2.1.6
-  - ANSIBLE_VERSION=2.0.2
+  global:
+    - CC_TEST_REPORTER_ID=2c0e6ce9e61357e6f15cf76a915b3868235d93e0b849218220242e456bfaa2aa
+  matrix:
+    - ANSIBLE_VERSION=2.8.10
+    - ANSIBLE_VERSION=2.7.16
+    - ANSIBLE_VERSION=2.6.20
+    - ANSIBLE_VERSION=2.5.15
+    - ANSIBLE_VERSION=2.4.6
+    - ANSIBLE_VERSION=2.3.3
+    - ANSIBLE_VERSION=2.2.3
+    - ANSIBLE_VERSION=2.1.6
+    - ANSIBLE_VERSION=2.0.2
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
 script:
   - >
-    RUBY=2.6.4 && docker run --rm -e TRAVIS -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -e TRAVIS_PULL_REQUEST -it
-    -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION /bin/sh -c
-    "cd /app && bundle install --jobs=3 --retry=3 && CI=true bundle exec rake"
+    RUBY=2.7.0 && docker run --rm -e TRAVIS -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -e TRAVIS_PULL_REQUEST
+    -e CC_TEST_REPORTER_ID -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION /bin/sh -c
+    "cd /app && bundle install --jobs=3 --retry=3 &&
+    ./cc-test-reporter before-build &&
+    CI=true bundle exec rake && rm Gemfile.lock"
   - >
-    RUBY=2.5.6 && docker run --rm -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
+    RUBY=2.6.5 && docker run --rm -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
+    /bin/sh -c "cp -r /app /tmp/app && cd /tmp/app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+  - >
+    RUBY=2.5.7 && docker run --rm -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
     /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
   - >
-    RUBY=2.4.7 && docker run --rm -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
+    RUBY=2.4.9 && docker run --rm -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
     /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
   - >
     RUBY=2.3.7 && docker run --rm -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
@@ -31,3 +42,7 @@ script:
   - >
     RUBY=2.1.10 && docker run --rm -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
     /bin/sh -c "cd /app && bundle install --jobs=3 --retry=3 && bundle exec rake"
+after_script:
+  - RUBY=2.6.4 && docker run --rm -e TRAVIS -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -e TRAVIS_PULL_REQUEST
+    -e TRAVIS_TEST_RESULT -e CC_TEST_REPORTER_ID -it -v $PWD:/app pgeraghty/ansible-ruby:$RUBY-$ANSIBLE_VERSION
+    /bin/sh -c "cd /app && ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"

data/README.md

@@ -11,7 +11,7 @@
 ## Requirements
 
 Ensure [Ansible](http://docs.ansible.com/intro_getting_started.html) is installed and available to shell commands i.e. in PATH.
-[Tested](https://travis-ci.org/pgeraghty/ansible-wrapper-ruby) with Ansible versions 2.0.2 thru 2.8.5 and Ruby 2.1+, but please create an issue if you use a version that fails.
+[Tested](https://travis-ci.org/pgeraghty/ansible-wrapper-ruby) with Ansible versions 2.0.2 thru 2.9.6 and Ruby 2.1+, but please create an issue if you use a version that fails.
 
 ## Installation
 

data/ansible-wrapper.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'json'
 
-  spec.add_development_dependency 'bundler','~> 1.10'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'coveralls'

data/examples/streaming/Gemfile.lock

@@ -2,14 +2,16 @@ PATH
   remote: ../..
   specs:
     ansible-wrapper (0.2.0)
+      json
 
 GEM
   remote: https://rubygems.org/
   specs:
     daemons (1.3.1)
     eventmachine (1.2.7)
+    json (2.3.0)
     mustermann (1.0.3)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-protection (2.0.7)
       rack
     sinatra (2.0.7)

data/lib/ansible/playbook.rb

@@ -18,21 +18,48 @@ module Ansible
 
     # Stream execution of a playbook using PTY because otherwise output is buffered
     # @param pb [String] path to playbook
+    # @param raise_on_failure [Symbol] Specifies if streaming should raise an exception when a Playbook failure occurs.
+    #   Defaults to +:false+, can also be +:during+ to raise as soon as an error occurs or +:after+ to allow all output to stream first.
+    # @raise [Playbook::Exception] if +raise_on_failure+ is truthy
     # @return [Integer] exit status
-    def stream(pb)
+    def stream(pb, raise_on_failure: false)
       cmd = config.to_s("#{BIN} #{pb}")
+      error_at_line = {}
+
+      pid = SafePty.spawn cmd do |r,_,_| # add -vvvv here for verbose
+        line_num = 0
 
-      SafePty.spawn cmd do |r,_,_| # add -vvvv here for verbose
         until r.eof? do
           line = r.gets
+          line_num += 1
+
           block_given? ? yield(line) : puts(line)
 
-          case line
-            when /fatal: \[/ then raise Playbook::Exception.new("FAILED: #{line}")
-            when /ERROR!/,/FAILED!/  then raise Playbook::Exception.new("ERROR: #{line}")
+          # track errors in output by line
+          if raise_on_failure
+            case line
+              when /fatal: \[/ then error_at_line[line_num] ||= "FAILED: #{line}"
+              when /ERROR!/, /FAILED!/ then error_at_line[line_num] ||= "ERROR: #{line}"
+              # allow errors on previous line to be ignored
+              when /...ignoring/ then error_at_line.delete(line_num-1)
+            end
+
+            if raise_on_failure == :during
+              # trigger failure unless it was ignored
+              fatal_unskipped_error = error_at_line[line_num-1]
+              raise Playbook::Exception.new(fatal_unskipped_error) if fatal_unskipped_error
+            end
           end
         end
       end
+
+      if raise_on_failure
+        # at this point, all output has been streamed
+        fatal_unskipped_error = error_at_line.first
+        raise Playbook::Exception.new(fatal_unskipped_error.last) if fatal_unskipped_error
+      end
+
+      pid
     end
   end
 

data/lib/ansible/version.rb

@@ -1,3 +1,3 @@
 module Ansible
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Paul Geraghty
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement