stripe-cli 1.8.0 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36fee7ef4d1a6f6173c8fb3c6da780b21d45e0f4
-  data.tar.gz: 3d5426b463809009fc79e91e85c53d7fd238df27
+  metadata.gz: 2c011a0b4876f5117b209ae046b3324a5563fe03
+  data.tar.gz: 10c2cda7d172ee7bf3276884919b004b2eb4d2bc
 SHA512:
-  metadata.gz: dd60ff68b1a6ee310f3bdd47357aebc40b9e29c287d3ebb2089d17d58a378094f748c8599558ee1d824b0839291e2b17c465c3017daa4a1c6e52fcbb78bd83fb
-  data.tar.gz: 33d671b2eba22025ae8896914669cb94e619f66662e1ab5bec7fec2701e32ced17c165c15faa57a365f0ed7bc72d5e9c3981d3cca22bf63d0a4f83b6ecac6b70
+  metadata.gz: c4394c23d23222509f14210f0b92c82247fa1d6532194b4c93ff879ff1c35f256161ec8c1f26ee5ccc13f8e89be666a76798a347bd3eaff14be57956a89bf815
+  data.tar.gz: 7726d0daccaf4cd42e1bc0ac6cc4c1ac217662bb69f1ed1d18e432a226f06557068dde33504af1cb1eb0962a6ac610a7f47122b73c40aef9784ec2d8ce241a78

data/README.md

@@ -63,7 +63,7 @@ If you choose to go this route, make sure to add `.stripecli` to your `.gitignor
 
 By default, Date/Time stamps are converted automatically to your local machine time. No more Epoch/Unix timestamp garbage!
 
-If you'd prefer to have time Date/Time stamps to be converted to UTC time, set the config option `dates` or `-d` to `utc`. You can also set it to `unix` to see the original Unix timestamp passed from the API. By default, it uses `local`.
+If you'd prefer to have time Date/Time stamps converted to UTC time, set the config option `dates` or `-d` to `utc`. You can also set it to `unix` to see the original Unix timestamp passed from the API. By default, it uses `local`.
 
 ### Dollars vs. Cents
 
@@ -92,13 +92,13 @@ If you need to adjust this setting temporarily, there are global flags which may
 
 ## General Features & Flexibility
 
-Any parameters accepted by the [stripe api](https://stripe.com/docs/api) are acceptable options to pass into commands, including metadata.
+Any parameters accepted by the [stripe api](https://stripe.com/docs/api) are acceptable options to pass into commands, including metadata and the `expand` parameter.
 
     $ stripe charges create  --amount=9.98  --description=a\ must\ have  --number=4242424242424242  --cvc=123  --exp-month=10  --exp-year=2020
 
 or
 
-    $ stripe charges create  --amount=16.72  --token=tok_abc123  --metadata=foo:bar meta:really\ meta\ data
+    $ stripe charges create  --amount=16.72  --token=tok_abc123  --metadata=foo:bar meta:baz --expand=balance_transaction
 
 or
 
@@ -169,8 +169,11 @@ Api errors are rescued and their messages displayed for you to read.  No more `b
       [-k | --key=KEY]         # One of your API secret keys, provided by Stripe
       [-e | --env=ENV]         # expects a `~/.stripecli` file with section headers for any string passed into it
       [-v | --version=VERSION] # Stripe API version-date. Looks like `YYYY-MM-DD`
+      [-d | --dates=DATES]     # Date Style. It should be either local, utc, or unix. Defaults to local.
       [--dollar-amounts]       # configuration flag setting expected currency units to dollars
       [--no-dollar-amounts]    # configuration flag setting expected currency units to cents
+      [--strip-nils]           # use this flag to strip nil-valued attributes from the output
+      [--expand=one two three] # one or more ID properties of the response you'd like expanded into full objects
 
 ## Command Documentation
 
@@ -605,17 +608,17 @@ Api errors are rescued and their messages displayed for you to read.  No more `b
 ### Invoice Items
 
     Commands:
-      stripe invoice_items create          # Create a new invoice item for customer
-      stripe invoice_items delete ID       # Delete a invoice item
-      stripe invoice_items find ID         # Find an invoice item
-      stripe invoice_items help [COMMAND]  # Describe subcommands or one specific subcommand
-      stripe invoice_items list            # List invoice items (optionally by customer_id)
+      stripe invoice-items create          # Create a new invoice item for customer
+      stripe invoice-items delete ID       # Delete a invoice item
+      stripe invoice-items find ID         # Find an invoice item
+      stripe invoice-items help [COMMAND]  # Describe subcommands or one specific subcommand
+      stripe invoice-items list            # List invoice items (optionally by customer_id)
 
 
 #### Invoice Item Create
 
     Usage:
-      stripe create
+      stripe invoice-item create
 
     Options:
           [--customer=CUSTOMER]                      # The ID of customer for the invoice item
@@ -633,21 +636,21 @@ Api errors are rescued and their messages displayed for you to read.  No more `b
 #### Invoice Item Delete
 
     Usage:
-      stripe delete ID
+      stripe invoice-item delete ID
 
     Delete a invoice item
 
 #### Invoice Item Find
 
     Usage:
-      stripe find ID
+      stripe invoice-item find ID
 
     Find an invoice item
 
 #### Invoice Item List
 
     Usage:
-      stripe list
+      stripe invoice-items list
 
     Options:
           [--starting-after=STARTING_AFTER]          # The ID of the last object in the previous paged result set. For cursor-based pagination.

data/changelog.md

@@ -1,5 +1,24 @@
 # Stripe-CLI Project Change Log
 
+## 1.8.3
+
+ - new command-line option `--expand` provides support for Stripe API expansions
+   - https://stripe.com/docs/api#expanding_objects
+   - stripe-ruby dependancy updated to version 1.24.0
+
+## 1.8.2
+
+ - bug fixes
+   - it was previously possible for certain command-line arguments to be passed through to the Stripe API resulting in API exceptions.
+   - creating tokens would fail for bank account type
+
+## 1.8.1
+
+ - new configuration option to strip nil-valued attributes from command-line output
+   - use on command-line with global flag `--strip-nils`
+   - or set in config-file with `strip_nils=true`
+   - override config-file setting with global command-line flag `--no-strip-nils`
+
 ## 1.8.0
 
  - top-level `invoice_items` command

data/example-configuration.stripecli

@@ -1,6 +1,8 @@
 default = test
 version = "2014-07-22"
 dollar_amounts = false
+dates = "utc"
+strip_nils = true
 
 [test]
   key = sk_test_abc123def456ghi789jklmno
@@ -11,4 +13,4 @@ dollar_amounts = false
 [new-api]
   key = sk_test_abc123def456ghi789jklmno
   version = "2014-09-08"
-  dollar_amounts = true
+  dollar_amounts = true

data/lib/stripe/cli/command.rb

@@ -11,6 +11,8 @@ module Stripe
       class_option :version, :aliases => :v, :type => :string, :desc => "Stripe API version-date. Looks like `YYYY-MM-DD`"
       class_option :dates, :aliases => :d, :type => :string, :desc => "Date Style. It should be either local, utc, or unix. Defaults to local.", :enum => %w(local utc unix)
       class_option :dollar_amounts, :type => :boolean, :desc => "set expected currency units to dollars or cents"
+      class_option :strip_nils, :type => :boolean, :desc => "use this flag to strip nil valued attributes from the output"
+      class_option :expand, :type => :array, :desc => "one or more ID properties of the response you'd like expanded into full objects"
 
 
       protected
@@ -27,13 +29,16 @@ module Stripe
         @env ||= options.delete(:env) || config['default']
       end
 
-      def dates
-        @dates ||= options.delete(:dates) || stored_api_option('dates')
+      def date_format
+        options.delete(:dates) || stored_api_option('dates')
       end
 
       def dollar_amounts
-        param_option = options.delete(:dollar_amounts)
-        param_option.nil? ? stored_api_option('dollar_amounts') == 'false' ? false : true : param_option
+        options.delete(:dollar_amounts) { !(stored_api_option('dollar_amounts') == 'false') }
+      end
+
+      def strip_nils?
+        options.delete(:strip_nils) { stored_api_option('strip_nils') == "true" }
       end
 
       def stored_api_option option
@@ -55,11 +60,11 @@ module Stripe
       end
 
       def list klass, options
-        request klass, :all, options, api_key
+        request klass, :all, options
       end
 
       def find klass, id
-        request klass, :retrieve, id, api_key
+        request klass, :retrieve, {:id => id, :expand => options[:expand]}
       end
 
       def delete klass, id
@@ -67,11 +72,11 @@ module Stripe
       end
 
       def create klass, options
-        request klass, :create, options, api_key
+        request klass, :create, options
       end
 
       def request object, method, *arguments
-        Stripe.api_version = api_version unless api_version.nil?
+        pre_request_setup
         begin
           output object.send method, *arguments
         rescue StripeError => e
@@ -90,18 +95,7 @@ module Stripe
         when Stripe::StripeObject
           inspect object.instance_variable_get(:@values)
         when Numeric
-          if object > 1000000000
-            case dates
-            when 'unix' then
-              object
-            when 'utc'
-              Time.at( object ).utc
-            else
-              Time.at( object )
-            end
-          else
-            object
-          end
+          object > 1000000000 ? handle_date(object) : object
         else
           object
         end
@@ -114,12 +108,32 @@ module Stripe
         ap inspect( objects ), :indent => -2
       end
 
+      # strip non-api params from options hash
+      # set api_version & api_key
+      def pre_request_setup
+        @strip_nils = strip_nils?
+        @date_format = date_format
+        Stripe.api_key = api_key
+        Stripe.api_version = api_version unless api_version.nil?
+      end
+
       def handle_hash object
         object.inject({}) do |hash, (key, value)|
-          hash[key] = inspect( value )
+          hash[key] = inspect( value ) unless @strip_nils && value.nil?
           hash
         end
       end
+
+      def handle_date object
+        case @date_format
+        when 'unix' then
+          object
+        when 'utc'
+          Time.at( object ).utc
+        else
+          Time.at( object )
+        end
+      end
     end
   end
 end

data/lib/stripe/cli/commands/recipients.rb

@@ -69,14 +69,7 @@ module Stripe
             options[:bank_account] = bank_account( options )
           end
 
-          options.delete :country
-          options.delete :account_number
-          options.delete :routing_number
-          options.delete :card_number
-          options.delete :card_exp_month
-          options.delete :card_exp_year
-          options.delete :card_cvc
-          options.delete :card_name
+          options.delete_if {|option,_| strip_list.include? option }
 
           super Stripe::Recipient, options
         end
@@ -88,6 +81,11 @@ module Stripe
           opt.delete(:corporation) ? 'corporation' :
           yes?('Corporation? [yN]') ? 'corporation' : 'individual'
         end
+
+        def strip_list
+          %i( card_number card_exp_month card_exp_year card_cvc card_name country routing_number account_number )
+        end
+
       end
     end
   end

data/lib/stripe/cli/commands/tokens.rb

@@ -21,20 +21,26 @@ module Stripe
         option :routing_number, :desc => "ACH routing number for bank account"
         option :account_number, :desc => "account number of bank account. Must be a checking account"
         def create type
-          case type
+          opt_symbol, value_hash = case type
           when 'card', 'credit_card', 'credit card'
-            credit_card = credit_card( options )
-            options = {}
-            options[:card] = credit_card
+            [ :card, credit_card( options ) ]
           when 'account', 'bank_account', 'bank account'
-            bank_account = bank_account( options )
-            options = {}
-            options[:bank_account] = bank_account
+            [ :bank_account, bank_account( options ) ]
           end
 
+          options.delete_if {|option,_| strip_list.include? option }
+
+          options[opt_symbol] = value_hash
+
           super Stripe::Token, options
         end
 
+        private
+
+        def strip_list
+          %i( card card_number card_exp_month card_exp_year card_cvc card_name bank_account country routing_number account_number )
+        end
+
       end
     end
   end

data/lib/stripe/cli/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module CLI
-    VERSION = "1.8.0"
+    VERSION = "1.8.3"
   end
 end

data/stripe-cli.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rspec', '~> 2.12', '>= 2.12.0'
   spec.add_runtime_dependency 'thor', '~> 0.18', '>= 0.18.1'
-  spec.add_runtime_dependency 'stripe', '~> 1.12', '>= 1.12.0'
+  spec.add_runtime_dependency 'stripe', '~> 1.24.0', '>= 1.24.0'
   spec.add_runtime_dependency 'awesome_print', '~> 1.2', '>= 1.2.0'
   spec.add_runtime_dependency 'parseconfig', '~> 1.0', '>= 1.0.4'
   spec.add_runtime_dependency 'chronic', '~> 0.10', '>= 0.10.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-cli
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.3
 platform: ruby
 authors:
 - Alex MacCaw
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,20 +71,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.24.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.24.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement