rainforest-cli 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eea3ded8136b1db14a83589961e477828630f43
-  data.tar.gz: c4ddb62a796a3e979c276fb7433e662042bae7ba
+  metadata.gz: d643c76641c2871f0f18ea635ffe868546443721
+  data.tar.gz: 073a323ecb28931576a27d1a7f352718920a3e83
 SHA512:
-  metadata.gz: f4aee39f29541cd65b8952073f97566708a993f046ef1d03cde128ed66591254a8602a9897f69280a2e6b9085c991c193ecfdebb20299c6485dc60d55e5e6634
-  data.tar.gz: ad432b0a9c7b73b0be7bb7b50bafec82f7b8c1020a967e61b61a40d91aab491f6054a665ec7bc2a72e40004d8e6d6f00f8e9929a16c853f871ccdfad989539c3
+  metadata.gz: 6b612e2ff7c36f3a666aa6ce0e15740c6051a6af936a3f117ccef0b87d056e6e1c242c5cae54571b880f0bbc7b573b7cfeb117f1691f2dbb984a26dd8f333d5a
+  data.tar.gz: 74af9041c9d0b69815a33588b819cfaf44ed323cff190224fd68bf94ad57fbd101f7d709ce8c887bfdf288da8ac287fc74a7806a1567c38f2086609e91e8d281

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Rainforest CLI Changelog
 
+## 1.12.0 - 6th February 2017
+- Add category column to list of sites when using the `sites` command.
+
 ## 1.11.0 - 4th November 2016
 - Add `--single-use` flag for CSV uploads. (17a19694a788365beb59e634bd7286c86528484b, @epaulet)
 

data/lib/rainforest_cli/resources.rb

@@ -1,49 +1,53 @@
 # frozen_string_literal: true
+require 'terminal-table'
+
 class RainforestCli::Resources
-  Resource = Struct.new(:identifier, :name)
+  HUMANIZE_SITE_CATEGORIES = {
+    'device_farm' => 'Device Farm',
+    'android' => 'Android',
+    'ios' => 'iOS',
+    'site' => 'Site',
+  }.freeze
 
   def initialize(options)
     @client = RainforestCli::HttpClient.new(token: options.token)
   end
 
   def sites
-    sites = @client.get('/sites').map { |s| Resource.new(s['id'], s['name']) }
+    sites = @client.get('/sites').map do |s|
+      category = s['category']
+      [s['id'], s['name'], HUMANIZE_SITE_CATEGORIES[category] || category]
+    end
 
     if sites.empty?
       logger.info('No sites found on your account.')
       logger.info('Please visit https://app.rainforestqa.com/settings/sites to create and edit your sites.')
     else
-      print_table('Site', sites)
+      print_table(['Site ID', 'Site Name', 'Category'], sites)
     end
   end
 
   def folders
-    folders = @client.get('/folders?page_size=100').map { |f| Resource.new(f['id'], f['title']) }
+    folders = @client.get('/folders?page_size=100').map { |f| f.values_at('id', 'title') }
+
     if folders.empty?
       logger.info('No folders found on your account.')
       logger.info('Please visit https://app.rainforestqa.com/folders to create and edit your sites.')
     else
-      print_table('Folder', folders)
+      print_table(['Folder ID', 'Folder Name'], folders)
     end
   end
 
   def browsers
     account = @client.get('/clients')
-    browsers = account['available_browsers'].map { |b| Resource.new(b['name'], b['description']) }
-    print_table('Browser', browsers)
+    browsers = account['available_browsers'].map { |b| b.values_at('name', 'description') }
+    print_table(['Browser ID', 'Browser Name'], browsers)
   end
 
-  def print_table(resource_name, resources)
-    id_col = "#{resource_name} ID"
-    longest_id = resources.map { |r| r.identifier.to_s }.max_by(&:length)
-    col_length = [id_col.length, longest_id.length].max
-
-    table_heading = "#{id_col.rjust(col_length)} | #{resource_name} Name"
-    puts table_heading
-    puts '-' * table_heading.length
-    resources.each do |resource|
-      puts "#{resource.identifier.to_s.rjust(col_length)} | #{resource.name}"
-    end
+  def print_table(headings, rows)
+    table = Terminal::Table.new(headings: headings, rows: rows)
+    table.align_column(0, :right)
+    puts table
   end
 
   private

data/lib/rainforest_cli/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module RainforestCli
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

data/rainforest-cli.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rainforest', '~> 2.1', '>= 2.1.0'
   spec.add_dependency 'http-exceptions', '~> 0.0', '>= 0.0.4'
   spec.add_dependency 'builder', '~> 3.2'
+  spec.add_dependency 'terminal-table', '1.7.3'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
 end

data/spec/rainforest_cli/resources_spec.rb

@@ -9,10 +9,8 @@ describe RainforestCli::Resources do
     end
 
     it 'calls the print method with the correct information' do
-      expect(subject).to receive(:print_table) do |_name, resources|
-        resource = resources.first
-        expect(resource.identifier).to eq(expected_id)
-        expect(resource.name).to eq(expected_name)
+      expect(subject).to receive(:print_table) do |_headers, rows|
+        expect(rows).to eq(expected_rows)
       end
 
       subject.send(tested_method)
@@ -40,13 +38,18 @@ describe RainforestCli::Resources do
     context 'with sites in account' do
       let(:api_response) do
         [
-          { 'id' => 123, 'name' => 'The Foo Site' },
-          { 'id' => 456, 'name'=> 'The Bar Site' },
-          { 'id' => 789, 'name' => 'The Baz Site' }
+          { 'id' => 123, 'name' => 'The Foo Site', 'category' => 'cat A' },
+          { 'id' => 456, 'name'=> 'The Bar Site', 'category' => 'cat B' },
+          { 'id' => 789, 'name' => 'The Baz Site', 'category' => 'cat C' },
+        ]
+      end
+      let(:expected_rows) do
+        [
+          [123, 'The Foo Site', 'cat A'],
+          [456, 'The Bar Site', 'cat B'],
+          [789, 'The Baz Site', 'cat C'],
         ]
       end
-      let(:expected_id) { api_response.first['id'] }
-      let(:expected_name) { api_response.first['name'] }
 
       it_should_behave_like 'a properly formatted resource', :sites
     end
@@ -75,24 +78,28 @@ describe RainforestCli::Resources do
         [
           { 'id' => 123, 'title' => 'The Foo Folder' },
           { 'id' => 456, 'title'=> 'The Bar Folder' },
-          { 'id' => 789, 'title' => 'The Baz Folder' }
+          { 'id' => 789, 'title' => 'The Baz Folder' },
+        ]
+      end
+      let(:expected_rows) do
+        [
+          [123, 'The Foo Folder'],
+          [456, 'The Bar Folder'],
+          [789, 'The Baz Folder'],
         ]
       end
-      let(:expected_id) { api_response.first['id'] }
-      let(:expected_name) { api_response.first['title'] }
 
       it_should_behave_like 'a properly formatted resource', :folders
 
-
       it 'should make a get request for 100 pages' do
+        allow(subject).to receive(:print_table)
+
         expect_any_instance_of(RainforestCli::HttpClient).to receive(:get) do |_obj, message|
           expect(message).to include('page_size=100')
         end.and_return(api_response)
         subject.folders
       end
     end
-
-
   end
 
   describe '#browsers' do
@@ -100,36 +107,18 @@ describe RainforestCli::Resources do
       [
         { 'name' => 'chrome', 'description' => 'Chrome' },
         { 'name' => 'safari', 'description' => 'Safari' },
-        { 'name' => 'firefox', 'description' => 'Firefox' }
+        { 'name' => 'firefox', 'description' => 'Firefox' },
       ]
     end
     let(:api_response) { { 'available_browsers' => api_resources } }
-    let(:expected_id) { api_resources.first['name'] }
-    let(:expected_name) { api_resources.first['description'] }
+    let(:expected_rows) do
+      [
+        ['chrome', 'Chrome'],
+        ['safari', 'Safari'],
+        ['firefox', 'Firefox'],
+      ]
+    end
 
     it_should_behave_like 'a properly formatted resource', :browsers
   end
-
-  describe '#print_table' do
-    let(:resource_id) { 123456 }
-    let(:resource_name) { 'resource name' }
-    let(:resources) { [ RainforestCli::Resources::Resource.new(resource_id, resource_name) ] }
-
-    it 'prints out the resources' do
-      expect(subject).to receive(:puts) do |message|
-        expect(message).to include('Resource ID')
-        expect(message).to include('Resource Name')
-      end
-
-      # Stub dashed the line dividing table header and body
-      expect(subject).to receive(:puts)
-
-      expect(subject).to receive(:puts) do |message|
-        expect(message).to include(resource_id.to_s)
-        expect(message).to include(resource_name)
-      end
-
-      subject.print_table('Resource', resources)
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Russell Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -133,6 +133,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement