awesomekit 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7ab5dc29d8d9f285b380e00960d32c61bb26bc
-  data.tar.gz: 4f64ed4474f314e6087f6e4fbb220d515ee9bd71
+  metadata.gz: 9597254f6ceaeca2ee78fcdc52e3dc892c1b2dd9
+  data.tar.gz: 20db737d66db06ae670145a815c38560ee9376a0
 SHA512:
-  metadata.gz: 159a13a507dc51481402214e5588446cd0fe2f6c5ffcd229735d271a63736014018636f0bf2be4cd22c317454eac07e35f76e53fe4d7d5289ced052415151d63
-  data.tar.gz: f0ebc1288b930eafb1576c7168f2bdae1435d715fcd69e232d14bc2616792ad8231dd89d4786e989aa2a65ca6749034a8e07aa724e9d9acd154555d98dce31a5
+  metadata.gz: a5f1abe2c5414d763a9e3a4171a57ad5ae26579729c697a7e194bada92d28d3c71122cbe8cd10d07d7987ad687186d14c15e2d5065c80f590dcdc0562da24d82
+  data.tar.gz: f56aaeea1d803ff507725753a7a2d45ed10a4287d3a9ce1ab04b305af0539cd1cad6f78d0a11f5c99229d48e1b4b184692d690140b816400980b57cd58b6a16e

data/lib/awesomekit.rb

@@ -1,10 +1,8 @@
 module Awesomekit
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   NAME = 'awesomekit'
 end
 
-require 'formatador'
-
 require 'awesomekit/authenticator'
 require 'awesomekit/client'
 require 'awesomekit/cli'

data/lib/awesomekit/authenticator.rb

@@ -2,33 +2,33 @@ module Awesomekit
   class Authenticator
     CONFIG_FILE = '.typekit'
 
-    # PUBLIC: Return the current saved api_key
-    # If no key exists, prompt user for key
-    def self.api_key
+    # PUBLIC: Return the current saved api_token
+    # If no token exists, prompt user for token
+    def self.api_token
       if File.exist?(config)
         File.open(config, 'r').gets
       else
-        prompt_user_for_key
+        prompt_user_for_token
       end
     end
 
-    # PUBLIC: Delete any existing api_key config file
-    def self.clear_api_key
+    # PUBLIC: Delete any existing api_token config file
+    def self.clear_api_token
       File.unlink(config) if File.exist?(config)
     end
 
     private
 
-    def self.prompt_user_for_key
-      Formatador.display('[yellow]Please enter your Adobe Typekit API key: [/]')
-      api_key = STDIN.gets.chomp
-      save_key_to_config(api_key)
-      api_key
+    def self.prompt_user_for_token
+      ap('Enter your Adobe Typekit API token: ', color: { string: :yellow })
+      api_token = STDIN.gets.chomp
+      save_token_to_config(api_token)
+      api_token
     end
 
-    def self.save_key_to_config(api_key)
+    def self.save_token_to_config(api_token)
       File.open(config, 'w') do |file|
-        file.write(api_key)
+        file.write(api_token)
       end
     end
 

data/lib/awesomekit/cli.rb

@@ -1,13 +1,14 @@
 require 'thor'
+require 'awesome_print'
 
 module Awesomekit
   class CLI < Thor
     include Thor::Actions
 
-    desc 'logout', 'Remove your Adobe Typekit API key'
+    desc 'logout', 'Remove your Adobe Typekit API token'
     def logout
-      Awesomekit::Authenticator.clear_api_key
-      Formatador.display_line('[yellow]Successfully logged out[/]')
+      Awesomekit::Authenticator.clear_api_token
+      ap('Successfully logged out', color: { string: :yellow })
     end
 
     desc 'list', 'List available kits'
@@ -17,14 +18,13 @@ module Awesomekit
       published version of the kit. Defaults to false, or draft kit version.'
     def list
       kits = typekit_client.get_kits
-      return not_found if kits.empty?
 
-      display_kits(kits)
+      ap(kits) if kits
 
       if options[:verbose]
         kits.each do |kit|
           kit = typekit_client.get_kit(kit['id'], options[:published])
-          display_kit_detail(kit)
+          ap(kit) if kit
         end
       end
     end
@@ -37,47 +37,13 @@ module Awesomekit
     def show
       kit = typekit_client.get_kit(options[:id], options[:published])
 
-      display_kit_detail(kit)
+      ap(kit) if kit
     end
 
     private
 
-    def display_kits(kits)
-      Formatador.display_line("[bold]Your Kits:[/]")
-      Formatador.display_table(kits)
-    end
-
-    def display_kit_detail(kit)
-      Formatador.display_line("[blue]Kit: #{kit['name']}[/]")
-      kit_data = [{
-        id: kit['id'],
-        domains: kit['domains'].join(','),
-        analytics: kit['analytics'].to_s
-      }]
-      Formatador.display_table(kit_data, [:id, :domains, :analytics])
-
-      Formatador.display_line("[bold]#{kit['name']} Families:[/]")
-      kit['families'].each do |family|
-        display_family_detail(family)
-      end
-    end
-
-    def display_family_detail(family)
-      family_data = [{
-        name: family['name'],
-        id: family['id'],
-        slug: family['slug'],
-        css_names: family['css_names'].join(',')
-      }]
-      Formatador.display_table(family_data, [:name, :id, :slug, :css_names])
-    end
-
-    def not_found
-      Formatador.display_line('[red]No kits found[/]')
-    end
-
     def typekit_client
-      @client ||= Awesomekit::Client.new(Awesomekit::Authenticator.api_key)
+      @client ||= Awesomekit::Client.new(Awesomekit::Authenticator.api_token)
     end
   end
 end

data/lib/awesomekit/client.rb

@@ -6,8 +6,8 @@ module Awesomekit
 
     base_uri 'https://typekit.com/api/v1/json'
 
-    def initialize(api_key)
-      self.class.headers('X-Typekit-Token' => api_key)
+    def initialize(api_token)
+      self.class.headers('X-Typekit-Token' => api_token)
     end
 
     # PUBLIC: Returns a list of kits owned by the authenticating user
@@ -15,9 +15,13 @@ module Awesomekit
     def get_kits
       response = self.class.get("/kits")
 
-      process_errors(response)
+      return if process_errors(response)
 
-      response['kits']
+      # If no kits are found, an empty array is returned (not a Not Found error)
+      kits = response['kits']
+      return not_found if kits.nil? || kits.empty?
+
+      kits
     end
 
     # PUBLIC: Returns information about a kit found by kit_id
@@ -32,7 +36,7 @@ module Awesomekit
         response = self.class.get("/kits/#{kit_id}")
       end
 
-      process_errors(response)
+      return if process_errors(response)
 
       response['kit']
     end
@@ -41,21 +45,25 @@ module Awesomekit
 
     # PRIVATE: Display any error messages returned by Typekit.
     #
-    # Automatically removes an invalid api_key if error is a 401 not authorized,
-    # so the user will be prompted to enter a new key on their next request.
+    # Automatically removes an invalid api_token if error is a 401 not authorized,
+    # so the user will be prompted to enter a new token on their next request.
     def process_errors(response)
       if response['errors']
-        errors = '[red]The server responded with the following error(s):[/] '
+        errors = 'The server responded with the following error(s): '
         errors << response['errors'].join(',')
 
         if errors.include?('Not authorized')
-          Awesomekit::Authenticator.clear_api_key
+          Awesomekit::Authenticator.clear_api_token
         end
 
-        Formatador.display_line(errors)
+        puts(errors)
 
-        exit
+        return true
       end
     end
+
+    def not_found
+      puts('No kits found')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesomekit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Liz Hubertz
@@ -39,19 +39,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: formatador
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement