cloudcost 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4a4e7ae052a00c793f664be431acc0b93c1e8a32e69dc7f1263efb6fd820cd
-  data.tar.gz: bc0001f2c9b44a19da53c9a5ea446b441de78236c787bc434820ffbb6504246b
+  metadata.gz: 1b58764fd578b202e42b613003289f95b778b9c409f6bcb4c9ce6d565c90016d
+  data.tar.gz: f8137acc0b1c0529550b5a1c135fcb808ca3e1596ea6d22b018aa117c6f44311
 SHA512:
-  metadata.gz: 5d9d615b734291387c9adbb5ac28a619a65d359fbf584af406175496abe1450f6a8ce5a7365a16f42319744959fbbdf7eb6ae556b49e47929b7dc46521f15a79
-  data.tar.gz: 8672668910d5c4e6de0115bb4c64466283afcb43baeb791914e3a62cd399d0b7285d8d86ad45a21692d3f447ad0249ea66463a02ef4cc47b931a291a8b0d0024
+  metadata.gz: 28a277fafc87edfc66ea733900e62bb801879cc8434974901b8e1c34532bc4e5fddbc3b3b3ba04a14c478e6045de999aaf3bbfa72297b8f69a718da5461f9751
+  data.tar.gz: 74f8f13db587ccc0bfd0ca94ac5444a6238cde48744c23957432235bb7ed2e7d06d91a6ab0ba38f7911bb2de8abe0993ccd59539c51deef20edd2ef72c5c9327

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudcost (0.3.0)
+    cloudcost (0.3.1)
       excon (~> 0.85.0)
       parseconfig (~> 1.1.0)
       terminal-table (~> 3.0.1)
@@ -13,7 +13,7 @@ GEM
   specs:
     excon (0.85.0)
     parseconfig (1.1.0)
-    terminal-table (3.0.1)
+    terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.1.0)
     tty-cursor (0.7.1)

data/README.md

@@ -19,8 +19,7 @@ gem install cloudcost
 
 cloudcost does support the same auth configuration options as [cloudscale-cli](https://cloudscale-ch.github.io/cloudscale-cli/).
 
-You can manage multiple profiles using `cloudscale.ini` files ([see here](https://cloudscale-ch.github.io/cloudscale-cli/auth/) for instructions). 
-
+You can manage multiple profiles using `cloudscale.ini` files ([see here](https://cloudscale-ch.github.io/cloudscale-cli/auth/) for instructions).
 
 Otherwise you can export a `CLOUDSCALE_API_TOKEN` in your environment:
 

data/lib/cloudcost/api_token.rb

@@ -3,7 +3,6 @@
 require "parseconfig"
 require "excon"
 require "json"
-require "cloudcost/error"
 
 module Cloudcost
   # Support for cloudscale-cli style API-tokens and profiles

data/lib/cloudcost/cli.rb

@@ -45,11 +45,7 @@ module Cloudcost
       end
     rescue Excon::Error, TokenError, ProfileError, PricingError => e
       error_message = "ERROR: #{e.message}"
-      if spinner
-        spinner.error("(#{error_message})")
-      else
-        puts error_message
-      end
+      spinner ? spinner.error(error_message) : puts(error_message)
     end
 
     desc "server-tags", "show and assign tags of servers"
@@ -80,19 +76,18 @@ module Cloudcost
             (options[:remove_tags] || []).each do |tag|
               tags.reject! { |k| k == tag.to_sym }
             end
-            api_connection(options).set_server_tags(server.uuid, tags)
-            spinner.success
+            begin
+              api_connection(options).set_server_tags(server.uuid, tags)
+              spinner.success
+            rescue Excon::Error => e
+              spinner.error "ERROR: #{e.message}"
+            end
           end
         end
         spinners.auto_spin
       end
-    rescue Excon::Error, TokenError, ProfileError => e
-      error_message = "ERROR: #{e.message}"
-      if defined?(spinner)
-        spinner.error("(#{error_message})")
-      else
-        puts error_message
-      end
+    rescue Cloudcost::TokenError, Cloudcost::ProfileError => e
+      puts "ERROR: #{e.message}"
     end
 
     desc "volumes", "explore volumes"
@@ -101,6 +96,7 @@ module Cloudcost
     option :summary, desc: "display totals only", type: :boolean, aliases: %w[-S]
     option :type, enum: %w[ssd bulk], desc: "volume type"
     option :attached, type: :boolean, desc: "volume attached to servers"
+    option :output, default: "table", enum: %w[table csv], desc: "output format", aliases: %w[-o]
     def volumes
       volumes = load_volumes(options)
       if options[:output] == "table"
@@ -111,13 +107,9 @@ module Cloudcost
         spinner&.success("(done)")
         puts result
       end
-    rescue Excon::Error, TokenError, ProfileError, PricingError => e
+    rescue Excon::Error, Cloudcost::TokenError, Cloudcost::ProfileError, Cloudcost::PricingError => e
       error_message = "ERROR: #{e.message}"
-      if spinner
-        spinner.error("(#{error_message})")
-      else
-        puts error_message
-      end
+      spinner ? spinner.error(error_message) : puts(error_message)
     end
 
     no_tasks do
@@ -140,9 +132,12 @@ module Cloudcost
           spinner = TTY::Spinner.new("[:spinner] Loading servers...", clear: options[:csv])
           spinner.auto_spin
         end
-        servers = api_connection(options).get_servers(options).map { |server| Server.new(server) }
+        servers = api_connection(options).get_servers(options).map { |server| Cloudcost::Server.new(server) }
         spinner&.success "(#{servers.size} found)"
         servers
+      rescue Excon::Error => e
+        spinner&.error "ERROR: #{e.message}"
+        []
       end
 
       def load_volumes(options)
@@ -150,13 +145,18 @@ module Cloudcost
           spinner = TTY::Spinner.new("[:spinner] Loading volumes...", clear: options[:csv])
           spinner.auto_spin
         end
-        volumes = api_connection(options).get_volumes(options).map { |volume| Volume.new(volume) }
+        volumes = api_connection(options).get_volumes(options).map { |volume| Cloudcost::Volume.new(volume) }
         spinner&.success "(#{volumes.size} found)"
         volumes
+      rescue Excon::Error => e
+        spinner&.error "\ERROR: #{e.message}"
+        []
       end
 
       def output_servers(servers, options)
-        if options[:group_by]
+        if servers.size < 1
+          yield "WARNING: No servers found."
+        elsif options[:group_by]
           yield Cloudcost::ServerList.new(servers, options).grouped_costs
         elsif options[:output] == "csv"
           yield Cloudcost::ServerList.new(servers, options).to_csv
@@ -170,7 +170,13 @@ module Cloudcost
       end
 
       def output_volumes(volumes, options)
-        yield Cloudcost::VolumeList.new(volumes, options).cost_table
+        if volumes.size < 1
+          yield "WARNING: No volumes found."
+        elsif options[:output] == "csv"
+          yield Cloudcost::VolumeList.new(volumes, options).to_csv
+        else
+          yield Cloudcost::VolumeList.new(volumes, options).cost_table
+        end
       end
 
       def tag_option_to_s(options)

data/lib/cloudcost/{csv_output.rb → commands/csv_output.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Cloudcost
-  # CSV output methods for the ServerList class
+  # generic CSV output methods
   module CsvOutput
     def groups_to_csv(group_rows)
       CSV.generate do |csv|

data/lib/cloudcost/{server.rb → commands/server/server.rb}

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "cloudcost/pricing"
-
 module Cloudcost
   def self.tags_to_s(tag_hash = [])
     tag_hash.map { |k, v| "#{k}=#{v}" }.join(" ")

data/lib/cloudcost/{influxdb_output.rb → commands/server/server_influxdb_output.rb}

@@ -2,7 +2,7 @@
 
 module Cloudcost
   # InfluxDB output methods for the ServerList class
-  module InfluxdbOutput
+  module ServerInfluxdbOutput
     def grouped_influx_line_protocol(group_rows)
       lines = []
       group_rows.each do |row|

data/lib/cloudcost/{server_list.rb → commands/server/server_list.rb}

@@ -3,9 +3,9 @@
 module Cloudcost
   # ServerList represents a list of servers and integrates several output methods
   class ServerList
-    include Cloudcost::TabularOutput
+    include Cloudcost::ServerTabularOutput
+    include Cloudcost::ServerInfluxdbOutput
     include Cloudcost::CsvOutput
-    include Cloudcost::InfluxdbOutput
 
     def initialize(servers, options = {})
       @servers = servers

data/lib/cloudcost/{tabular_output.rb → commands/server/server_tabular_output.rb}

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require "terminal-table"
+
 module Cloudcost
   # Tabular output methods for the ServerList class
-  module TabularOutput
+  module ServerTabularOutput
     def headings
       headings = if @options[:summary]
                    [""]

data/lib/cloudcost/commands/server.rb

@@ -0,0 +1,6 @@
+
+require_relative "server/server_tabular_output"
+require_relative "server/server_influxdb_output"
+require_relative "csv_output"
+require_relative "server/server"
+require_relative "server/server_list"

data/lib/cloudcost/{volume_list.rb → commands/volume/volume_list.rb}

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require "terminal-table"
+
 module Cloudcost
   # volumeList represents a list of volumes and integrates several output methods
   class VolumeList
 
+    include Cloudcost::CsvOutput
+
     def initialize(volumes, options = {})
       @volumes = volumes
       @options = options
@@ -71,16 +75,5 @@ module Cloudcost
       table
     end
 
-    def grouped_cost_table(group_rows)
-      table = Terminal::Table.new do |t|
-        t.title = "cloudscale.ch volume costs grouped by tag \"#{@options[:group_by]}\""
-        t.title += " (#{@options[:profile]})" if @options[:profile]
-        t.headings = headings
-      end
-      table.rows = group_rows
-      (1..table.columns.size).each { |column| table.align_column(column, :right) }
-      table
-    end
-
   end
 end

data/lib/cloudcost/commands/volume.rb

@@ -0,0 +1,4 @@
+
+require_relative "csv_output"
+require_relative "volume/volume"
+require_relative "volume/volume_list"

data/lib/cloudcost/error.rb

@@ -6,4 +6,6 @@ module Cloudcost
   class ProfileError < Error; end
 
   class TokenError < Error; end
+
+  class PricingError < StandardError; end
 end

data/lib/cloudcost/pricing.rb

@@ -7,9 +7,6 @@ PRICING = YAML.load_file(File.join(
                          ))
 
 module Cloudcost
-  class PricingError < StandardError
-  end
-
   # pricing class which implements cost calculation methods for cloudscale.ch resources
   module Pricing
     def self.server_costs_per_day(flavor)

data/lib/cloudcost/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudcost
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/cloudcost.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require "terminal-table"
 require "csv"
 
 require "cloudcost/version"
+require "cloudcost/error"
 require "cloudcost/api_token"
 require "cloudcost/api_connection"
-require "cloudcost/server"
-require "cloudcost/tabular_output"
-require "cloudcost/influxdb_output"
-require "cloudcost/csv_output"
-require "cloudcost/server_list"
-require "cloudcost/volume"
-require "cloudcost/volume_list"
+require "cloudcost/pricing"
+require "cloudcost/commands/server"
+require "cloudcost/commands/volume"
 require "cloudcost/cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcost
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-19 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -102,16 +102,18 @@ files:
 - lib/cloudcost/api_connection.rb
 - lib/cloudcost/api_token.rb
 - lib/cloudcost/cli.rb
-- lib/cloudcost/csv_output.rb
+- lib/cloudcost/commands/csv_output.rb
+- lib/cloudcost/commands/server.rb
+- lib/cloudcost/commands/server/server.rb
+- lib/cloudcost/commands/server/server_influxdb_output.rb
+- lib/cloudcost/commands/server/server_list.rb
+- lib/cloudcost/commands/server/server_tabular_output.rb
+- lib/cloudcost/commands/volume.rb
+- lib/cloudcost/commands/volume/volume.rb
+- lib/cloudcost/commands/volume/volume_list.rb
 - lib/cloudcost/error.rb
-- lib/cloudcost/influxdb_output.rb
 - lib/cloudcost/pricing.rb
-- lib/cloudcost/server.rb
-- lib/cloudcost/server_list.rb
-- lib/cloudcost/tabular_output.rb
 - lib/cloudcost/version.rb
-- lib/cloudcost/volume.rb
-- lib/cloudcost/volume_list.rb
 homepage: https://gitlab.puzzle.ch/nwolfgramm/cloudcost
 licenses:
 - MIT