brightbox-cli 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c53d72de3a6736f877bbf91b00683418617d91f
-  data.tar.gz: 664bfccf33f96fb0b56e50e303e9a9d1cf269507
+SHA256:
+  metadata.gz: 0913b64952b1c93b6e8da4fae57444fbdbef214418c6ca5da82b48e25b2b2ed6
+  data.tar.gz: efae4032ec4db36e6cf618f4271e09718322dfbac24a85c3f84496e23661268a
 SHA512:
-  metadata.gz: e6742474c0c264f4d7b621aae88fc2d322b50b708935bee29041cddcf15665bb4a92af4a2f7853c6ac434f2827ef28911c5c947003ebc50751b338cc24a1ab41
-  data.tar.gz: 0d95a1847318da2262b905d2b4664c6acdad4b73695ec645c7dc84aa346c26e16b13baa495ea38203241858d89ac62f70d4cedf4dad13e3aa7ee1b74dfbf9979
+  metadata.gz: 0df5e69cc133fc086a8a69bee79b38fd7337228e54be5bbc8729e1b08c1f152562b749dfb98128403802e7e7941e07ddea6ea7de3955478508fa26a69c8f8f6d
+  data.tar.gz: c968eef839066afce0ab0626bbed1ac750164dfa07eafeb87177f9249314de1d178962ad9e3e976ca3b9445ade3801db86a8c3cee3ead4c70769bbe6fe56045b

data/.travis.yml

@@ -9,3 +9,4 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### v2.8.2 /2018-08-21
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.8.1...v2.8.2)
+
+Bug fixes:
+
+* Fix image list filter when using `--account/-l` options caused by hash key
+  type change somewhere in the stack.
+
+Changes:
+
+* Update `fog-brightbox` to v0.15.0
+* Limit `fog-brightbox` dependency to < 1.0 to avoid issue following major update
+* Add Jenkinsfile for internal CI
+
 ### v2.8.1 / 2018-04-10
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.8.0...v2.8.1)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.8.1)
-      fog-brightbox (>= 0.14.0)
+    brightbox-cli (2.8.2)
+      fog-brightbox (>= 0.14.0, < 1.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
       hirb (~> 0.6)
@@ -20,16 +20,17 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     excon (0.62.0)
-    fog-brightbox (0.14.0)
+    fog-brightbox (0.15.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
+      mime-types
     fog-core (1.45.0)
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
+    fog-json (1.2.0)
+      fog-core
       multi_json (~> 1.10)
     formatador (0.2.5)
     gli (2.12.3)
@@ -79,4 +80,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

data/Jenkinsfile

@@ -0,0 +1,93 @@
+pipeline {
+  agent none
+  options {
+    ansiColor('xterm')
+  }
+  triggers {
+    cron('@monthly')
+  }
+  stages {
+    stage("Run tests") {
+      parallel {
+        stage("Ruby 1.9.3") {
+          agent {
+            docker {
+              image 'ruby:1.9.3'
+            }
+          }
+          steps {
+            sh 'BUNDLE_APP_CONFIG=/tmp/bundle.config BUNDLE_DISABLE_SHARED_GEMS=true bundle install --deployment'
+            sh 'BUNDLE_APP_CONFIG=/tmp/bundle.config bundle exec rake test'
+          }
+        }
+        stage("Ruby 2.0") {
+          agent {
+            docker {
+              image 'ruby:2.0'
+            }
+          }
+          steps {
+            sh 'bundle install --deployment'
+            sh 'bundle exec rake test'
+          }
+        }
+        stage("Ruby 2.1") {
+          agent {
+            docker {
+              image 'ruby:2.1'
+            }
+          }
+          steps {
+            sh 'bundle install --deployment'
+            sh 'bundle exec rake test'
+          }
+        }
+        stage("Ruby 2.2") {
+          agent {
+            docker {
+              image 'ruby:2.2'
+            }
+          }
+          steps {
+            sh 'bundle install --deployment'
+            sh 'bundle exec rake test'
+          }
+        }
+        stage("Ruby 2.3") {
+          agent {
+            docker {
+              image 'ruby:2.3'
+            }
+          }
+          steps {
+            sh 'bundle install --deployment'
+            sh 'bundle exec rake test'
+          }
+        }
+        stage("Ruby 2.4") {
+          agent {
+            docker {
+              image 'ruby:2.4'
+            }
+          }
+          steps {
+            sh 'bundle install --deployment'
+            sh 'bundle exec rake test'
+          }
+        }
+        stage("Ruby 2.5") {
+          agent {
+            docker {
+              image 'ruby:2.5'
+            }
+          }
+          steps {
+            sh 'bundle install --deployment'
+            sh 'bundle exec rake test'
+          }
+        }
+
+      }
+    }
+  }
+}

data/README.rdoc

@@ -1 +1 @@
-README
+./README

data/brightbox-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog-brightbox", ">= 0.14.0"
+  s.add_dependency "fog-brightbox", ">= 0.14.0", "< 1.0"
   s.add_dependency "gli", "~> 2.12.0"
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "mime-types", "~> 2.6"

data/lib/brightbox-cli/images.rb

@@ -41,7 +41,7 @@ module Brightbox
 
       unless options[:a]
         account = Account.conn.get_scoped_account(:nested => false)
-        images.reject! { |i| !i.official && i.owner_id != account[:id]  }
+        images.reject! { |i| !i.official && i.owner_id != account["id"]  }
       end
 
       snapshots = images.select { |i| i.source_type == 'snapshot' }

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "2.8.1" unless defined?(Brightbox::VERSION)
+  VERSION = "2.8.2" unless defined?(Brightbox::VERSION)
 end

data/spec/commands/images/list_spec.rb

@@ -7,11 +7,150 @@ describe "brightbox images" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
-    context "" do
+    before do
+      config_from_contents(USER_APP_CONFIG_CONTENTS)
+
+      stub_request(:post, "http://api.brightbox.dev/token").
+        to_return(status: 200, body: JSON.dump(access_token: "ACCESS-TOKEN", refresh_token: "REFRESH-TOKEN"))
+
+      image_listing_json = JSON.dump([
+        {
+          id: "img-test1",
+          name: "Official image",
+          status: "available",
+          official: true,
+          public: true,
+          source_type: "upload",
+          owner: "acc-99999"
+        },
+        {
+          id: "img-test2",
+          name: "Public image",
+          status: "available",
+          official: false,
+          public: true,
+          source_type: "upload",
+          owner: "acc-abcde"
+        },
+        {
+          id: "img-test3",
+          name: "Customer image",
+          status: "available",
+          official: false,
+          public: false,
+          source_type: "upload",
+          owner: "acc-12345"
+        },
+        {
+          id: "img-test4",
+          name: "Customer snapshot",
+          status: "available",
+          official: false,
+          public: false,
+          source_type: "snapshot",
+          owner: "acc-12345"
+        },
+        {
+          id: "img-test5",
+          name: "Customer deleting image",
+          status: "deleting",
+          official: false,
+          public: false,
+          source_type: "upload",
+          owner: "acc-12345"
+        }
+      ])
+
+      stub_request(:get, "http://api.brightbox.dev/1.0/images?account_id=acc-12345").
+        with(headers: { "Authorization" => "Bearer ACCESS-TOKEN" }).
+        to_return(status: 200, body: image_listing_json)
+
+      stub_request(:get, "http://api.brightbox.dev/1.0/account?account_id=acc-12345&nested=false").
+        with(headers: { "Authorization" => "Bearer ACCESS-TOKEN" }).
+        to_return(status: 200, body: JSON.dump({ id: "acc-12345" }))
+    end
+
+    context "when default listing" do
       let(:argv) { %w(images list) }
 
       it "does not error" do
-        expect { output }.to_not raise_error
+        expect(stderr).not_to include("ERROR")
+
+        expect(stdout).to include("img-test1")
+        expect(stdout).not_to include("img-test2")
+        expect(stdout).to include("img-test3")
+        expect(stdout).to include("img-test4")
+        expect(stdout).to include("img-test5")
+      end
+    end
+
+    context "when listing all cases" do
+      let(:argv) { %w(images list --show-all) }
+
+      it "does not error" do
+        expect(stderr).not_to include("ERROR")
+
+        expect(stdout).to include("img-test1")
+        expect(stdout).to include("img-test2")
+        expect(stdout).to include("img-test3")
+        expect(stdout).to include("img-test4")
+        expect(stdout).to include("img-test5")
+      end
+    end
+
+    context "when filtering by status" do
+      let(:argv) { %w(images list --status deleting) }
+
+      it "does not error" do
+        expect(stderr).not_to include("ERROR")
+
+        expect(stdout).not_to include("img-test1")
+        expect(stdout).not_to include("img-test2")
+        expect(stdout).not_to include("img-test3")
+        expect(stdout).not_to include("img-test4")
+        expect(stdout).to include("img-test5")
+      end
+    end
+
+    context "when filtering by type" do
+      let(:argv) { %w(images list --type snapshot) }
+
+      it "does not error" do
+        expect(stderr).not_to include("ERROR")
+
+        expect(stdout).not_to include("img-test1")
+        expect(stdout).not_to include("img-test2")
+        expect(stdout).not_to include("img-test3")
+        expect(stdout).to include("img-test4")
+        expect(stdout).not_to include("img-test5")
+      end
+    end
+
+    context "when filtering by own account ID" do
+      let(:argv) { %w(images list --account acc-12345) }
+
+      it "does not error" do
+        expect(stderr).not_to include("ERROR")
+
+        expect(stdout).not_to include("img-test1")
+        expect(stdout).not_to include("img-test2")
+        expect(stdout).to include("img-test3")
+        expect(stdout).to include("img-test4")
+        expect(stdout).to include("img-test5")
+      end
+    end
+
+    context "when filter by own account ID and all" do
+      let(:argv) { %w(images list --account acc-12345 --show-all) }
+
+      it "does not error" do
+        expect(stderr).not_to include("ERROR")
+
+        expect(stdout).not_to include("img-test1")
+        expect(stdout).not_to include("img-test2")
+        expect(stdout).to include("img-test3")
+        expect(stdout).to include("img-test4")
+        expect(stdout).to include("img-test5")
       end
     end
   end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift LIB_DIR unless
   $LOAD_PATH.include?(LIB_DIR) || $LOAD_PATH.include?(File.expand_path(LIB_DIR))
 
 require "brightbox_cli"
+require "json"
 require "tmpdir"
 
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +224,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Jenkinsfile
 - LICENSE
 - README
 - README.rdoc
@@ -732,7 +739,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: brightbox-cli
-rubygems_version: 2.6.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The Brightbox cloud management system