gocd 1.2.5 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 593cc65e4e514367d8e90e8e4f0b94b10aab593e
-  data.tar.gz: a67d98d2fb10ad7b7737d9ea5af9bf57737a6108
+SHA256:
+  metadata.gz: 188ab274b584582cbb0f8541d50165549b845d444f0120f784ce5dc7ef14e62a
+  data.tar.gz: '07808c0d30bfa63b5f1c4e395a3c2232bc81933d685d49a3ca003af748b7e0bc'
 SHA512:
-  metadata.gz: 07a84959366c3fb9115fbaa62784eb67ab843b096217103c622114756bba3fbdc94b9b5ba310baea7eb0bb1b6775f373852be0a6afc7aea34ecbf343a04208f6
-  data.tar.gz: 3da89e9e2ceb5a05b235c6b29751286093a2da1cc761f570e6dc6ccf7ddcfc9341f2a2a949594079a84e031254943b485e53109360875355aeed10b0b6abcaef
+  metadata.gz: b914ef2f894244676d15d7a12ef96ac4fab8a82ed28928e55fc3e57fa73d33da13b24b464dea34dda594340c23e27f2004e27c1567aac7225d3deaade6d03012
+  data.tar.gz: 23a87cb1c0e574afeacf305cc9c6a42abb8c600ab27bc2aa1b1ec09f2aaaab791f2433fd1b992b6bc1c5a5af394583036bbfcbd082e864048835a5c4d03b50d8

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.3.1
-  - ruby
+  - 2.3.0
+  - 2.4.0
+  - 2.5.0
 
-before_install:
-  - rvm install 2.3.1
-  - rvm use 2.3.1
+bundler_args: --without development
+before_install: gem install bundler

data/Gemfile

@@ -1,9 +1,9 @@
-ruby '2.3.1'
+raise 'Ruby should be >= 2.3' unless RUBY_VERSION.to_f >= 2.3
 
 source :rubygems
 
 gem 'activesupport'
 gem 'cobravsmongoose', '0.0.2'
-gem 'rspec', '~> 3.0'
+gem 'rspec'
 gem 'rake'
 gem 'rest-client'

data/Gemfile.lock

@@ -1,48 +1,49 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (5.0.0.1)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     cobravsmongoose (0.0.2)
-    concurrent-ruby (1.0.2)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20161021)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.7.0)
-    mime-types (3.1)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    minitest (5.9.0)
+    mime-types-data (3.2018.0812)
+    minitest (5.11.3)
     netrc (0.11.0)
-    rake (11.2.2)
-    rest-client (2.0.0)
+    rake (12.3.1)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.5)
 
 PLATFORMS
   ruby
@@ -52,10 +53,7 @@ DEPENDENCIES
   cobravsmongoose (= 0.0.2)
   rake
   rest-client
-  rspec (~> 3.0)
-
-RUBY VERSION
-   ruby 2.3.1p112
+  rspec
 
 BUNDLED WITH
-   1.13.6
+   1.16.1

data/README.md

@@ -1,7 +1,9 @@
 # gocd
 
+[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/ajitsing/gocd/graphs/commit-activity)
 [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://opensource.org/licenses/Apache-2.0)
 [![Gem Version](https://badge.fury.io/rb/gocd.svg)](https://badge.fury.io/rb/gocd)
+[![HitCount](http://hits.dwyl.io/ajitsing/gocd.svg)](http://hits.dwyl.io/ajitsing/gocd)
 ![Gem Downloads](http://ruby-gem-downloads-badge.herokuapp.com/gocd?type=total)
 [![Build Status](https://travis-ci.org/ajitsing/gocd.svg?branch=master)](https://travis-ci.org/ajitsing/gocd)
 [![Twitter Follow](https://img.shields.io/twitter/follow/Ajit5ingh.svg?style=social)](https://twitter.com/Ajit5ingh)

data/lib/gocd/config/credentials.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module GOCD
   class Credentials
     attr_reader :username, :password
@@ -8,7 +10,7 @@ module GOCD
     end
 
     def curl_credentials
-      "#{@username}:#{@password}"
+      Shellwords.escape("#{@username}:#{@password}")
     end
   end
 

data/lib/gocd/pipeline_status/pipeline_repository.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/hash/conversions'
 module GOCD
   class PipelineRepository
     def self.pipelines
-      @pipelines ||= fetch_data
+      fetch_data
     end
 
     private

data/lib/gocd/pipeline_status/pipelines.rb

@@ -1,62 +1,76 @@
 module GOCD
   class AllPipelines
     class << self
+      DEFAULT_OPTS = {cache: false}
+
       def information_available?
         !pipelines.nil?
       end
 
-      def red_pipelines
-        pipelines.select { |pipeline| pipeline.red? }
+      def red_pipelines(opts = {})
+        pipelines(opts).select { |pipeline| pipeline.red? }
       end
 
-      def green_pipelines
-        pipelines.select { |pipeline| pipeline.green? }
+      def green_pipelines(opts = {})
+        pipelines(opts).select { |pipeline| pipeline.green? }
       end
 
-      def status
-        pipelines.map { |pipeline| pipeline.status }
+      def status(opts = {})
+        pipelines(opts).map { |pipeline| pipeline.status }
       end
 
-      def any_red?
-        !red_pipelines.empty?
+      def any_red?(opts = {})
+        !red_pipelines(opts).empty?
       end
 
-      def pipelines
-        GOCD::PipelineRepository.pipelines
+      def pipelines(opts = {})
+        merged_opts = DEFAULT_OPTS.merge(opts)
+        if merged_opts[:cache]
+          @pipelines ||= GOCD::PipelineRepository.pipelines
+        else
+          @pipelines = GOCD::PipelineRepository.pipelines
+        end
       end
     end
   end
 
   class PipelineGroup
-    def initialize(pipelines)
+    def initialize(pipelines, opts = {})
       @pipelines = pipelines
+      @default_opts = {cache: false}.merge(opts)
     end
 
     def information_available?
       !pipelines.nil?
     end
 
-    def red_pipelines
-      pipelines.select { |pipeline| pipeline.red? }
+    def red_pipelines(opts = {})
+      pipelines(opts).select { |pipeline| pipeline.red? }
     end
 
-    def green_pipelines
-      pipelines.select { |pipeline| pipeline.green? }
+    def green_pipelines(opts = {})
+      pipelines(opts).select { |pipeline| pipeline.green? }
     end
 
-    def status
-      pipelines.map { |pipeline| pipeline.status }
+    def status(opts = {})
+      pipelines(opts).map { |pipeline| pipeline.status }
     end
 
-    def any_red?
-      !red_pipelines.empty?
+    def any_red?(opts = {})
+      !red_pipelines(opts).empty?
     end
 
-    def pipelines
-      all_pipelines = GOCD::PipelineRepository.pipelines
+    def pipelines(opts = {})
+      merged_opts = @default_opts.merge(opts)
+      if merged_opts[:cache]
+        @all_pipelines ||= GOCD::PipelineRepository.pipelines
+      else
+        @all_pipelines = GOCD::PipelineRepository.pipelines
+      end
+
       missing_pipelines = []
       @pipelines.select do |pipeline|
-        if all_pipelines.find { |p| p.name == pipeline }.nil?
+        if @all_pipelines.find { |p| p.name == pipeline }.nil?
           missing_pipelines << pipeline
         end
       end
@@ -67,7 +81,7 @@ module GOCD
       end
 
       @pipelines.map do |pipeline|
-        all_pipelines.find { |p| p.name == pipeline }
+        @all_pipelines.find { |p| p.name == pipeline }
       end
     end
   end

data/lib/gocd/version.rb

@@ -1,3 +1,3 @@
 module GOCD
-  VERSION = '1.2.5'
+  VERSION = '1.3'
 end

data/spec/gocd/config/credentials_spec.rb

@@ -6,4 +6,9 @@ RSpec.describe GOCD::Credentials, 'credentials' do
     credentials = GOCD::Credentials.new 'admin', 'password'
     expect(credentials.curl_credentials).to eq 'admin:password'
   end
-end
+
+  it '#curl_credentials should be escaped for the command line' do
+    credentials = GOCD::Credentials.new('admin', '"cpF@<`89Q.[cA]C%hj>M<s3\'sl')
+    expect(credentials.curl_credentials).to eq('admin:\"cpF@\<\`89Q.\[cA\]C\%hj\>M\<s3\\\'sl')
+  end
+end

data/spec/gocd/pipeline_status/pipelines_spec.rb

@@ -43,6 +43,18 @@ RSpec.describe GOCD::AllPipelines, 'pipelines' do
       mock_pipeline_repository_with_green_pipelines
       expect(GOCD::AllPipelines.any_red?).to be_falsy
     end
+
+    context 'cache' do
+      it 'should not fetch latest pipelines when cache is enabled' do
+        mock_pipeline_repository
+
+        GOCD::AllPipelines.pipelines(cache: false)
+        GOCD::AllPipelines.any_red?(cache: true)
+        GOCD::AllPipelines.red_pipelines(cache: true)
+        GOCD::AllPipelines.green_pipelines(cache: true)
+        GOCD::AllPipelines.status(cache: true)
+      end
+    end
   end
 
 
@@ -83,5 +95,43 @@ RSpec.describe GOCD::AllPipelines, 'pipelines' do
       pipeline_group = GOCD::PipelineGroup.new %w(pipeline1 pipeline3)
       expect{pipeline_group.any_red?}.to raise_error(PipelinesNotFoundException).with_message("Could not find [\"pipeline3\"]")
     end
+
+    context 'cache' do
+      it 'should not fetch latest pipelines when cache is enabled' do
+        pipeline = instance_double("Pipeline", :red? => false, :green? => true, :status => 'passing', :name => 'pipeline1')
+        expect(GOCD::PipelineRepository).to receive(:pipelines).once.and_return([pipeline])
+
+        pipeline_group = GOCD::PipelineGroup.new %w(pipeline1)
+
+        pipeline_group.pipelines(cache: true)
+        pipeline_group.any_red?(cache: true)
+        pipeline_group.red_pipelines(cache: true)
+        pipeline_group.green_pipelines(cache: true)
+        pipeline_group.status(cache: true)
+      end
+
+      it 'should not fetch latest pipelines when cache is enabled during initialization' do
+        pipeline = instance_double("Pipeline", :red? => false, :green? => true, :status => 'passing', :name => 'pipeline1')
+        expect(GOCD::PipelineRepository).to receive(:pipelines).once.and_return([pipeline])
+
+        pipeline_group = GOCD::PipelineGroup.new %w(pipeline1), cache: true
+
+        pipeline_group.pipelines
+        pipeline_group.any_red?
+        pipeline_group.red_pipelines
+        pipeline_group.green_pipelines
+        pipeline_group.status
+      end
+
+      it 'should fetch latest pipelines when cache is disabled during api call' do
+        pipeline = instance_double("Pipeline", :red? => false, :green? => true, :status => 'passing', :name => 'pipeline1')
+        expect(GOCD::PipelineRepository).to receive(:pipelines).twice.and_return([pipeline])
+
+        pipeline_group = GOCD::PipelineGroup.new %w(pipeline1), cache: true
+
+        pipeline_group.pipelines
+        pipeline_group.any_red?(cache: false)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gocd
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: '1.3'
 platform: ruby
 authors:
 - Ajit Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,7 +102,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -166,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Get info from gocd using its apis

data/.ruby-version

@@ -1 +0,0 @@
-2.3.1