timely-app 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287d9e265de562279b0bfc72bc517687e5c0b21624bfe62ca8a7cd3de34dc249
-  data.tar.gz: 49fe41a32e6cf4d010c5f7ce9659b9076007691865331e03f2edf27a6d5ada69
+  metadata.gz: 5fc2e1df8e95c1af4f14f67e40bd7849218fa6a25a7012b91d6c6bedba49875b
+  data.tar.gz: f10ba288aa8074824ee6cd2508e509564575ea0519c8502220e9b13bfd02cee9
 SHA512:
-  metadata.gz: 3acf47aa0c8f60aebd9ffb56e82c708b1ff1c4a8db68ed87fa2f88b0f90494513d4cab9cf8a07ec275b69cdca4a52fcaaabf34de3d7144ecd7d97d877847c2ae
-  data.tar.gz: 1c651132733ec09c0535bf49f5fea5ec20504207523b69e8bb62f7b81d5939418075ad717388248bb3f2a5bf3a8c5f2fa5b23a91466f7ef9485b5a6f12636493
+  metadata.gz: e05a47853c2dfb6233e8ddca0bbb3f1250ebdc1618328f5694370e0128b0ae52606385ed8886230eb0a9df0a8ba7a620c01c4c258ca3f8ab57db3b8fcf33df5d
+  data.tar.gz: 9e384734bc8a02b3778927cad38cb4e667c40fbf7e91cb048007b0041818aa79c88c4e1831e86ce4c94cc6dd87bc1b2476ec5ff8b8763a59e841978f366b01e8

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.0.4
+
+* Update CLI to check input properly and handle command arguments
+
+# 1.0.3
+
+* Fix gemspec
+
 # 1.0.2
 
 * Add basic CLI script `timely-app`

data/bin/timely-app

@@ -0,0 +1,181 @@
+#!/usr/bin/env ruby
+
+require "yaml"
+require "optparse"
+require "timely-app"
+
+module TimelyApp
+  class CLI
+    attr_reader :options, :client
+
+    def initialize(options = {})
+      @options = options
+      @client = TimelyApp::Client.new(
+        access_token: options[:access_token] || fetch_access_token,
+        account_id: options[:account_id] || fetch_account_id,
+        verbose: options[:verbose]
+      )
+    end
+
+    def get_config(key)
+      read_config_file&.fetch(key, nil)
+    end
+
+    def set_config(key, value)
+      save_config_file(key => value)
+    end
+
+    def command_exists?(cmd)
+      return false if cmd.nil? || cmd.empty?
+
+      client.respond_to?(cmd)
+    end
+
+    def call(cmd, *args)
+      client.send(cmd, *args)
+    end
+
+    def auth(client_id, client_secret)
+      if !client_id || !client_secret
+        puts "Usage: timely-app auth CLIENT_ID CLIENT_SECRET"
+        exit 1
+      end
+
+      auth_client = TimelyApp::Client.new(verbose: options[:verbose])
+      auth_url = auth_client.get_oauth_authorize_url(
+        client_id: client_id,
+        redirect_uri: "urn:ietf:wg:oauth:2.0:oob"
+      )
+      puts "Visit this URL in your browser:"
+      puts auth_url
+      puts "\nEnter authorization code here:"
+      code = gets.chomp
+      begin
+        token = auth_client.post_oauth_token(
+          client_id: client_id,
+          client_secret: client_secret,
+          code: code,
+          redirect_uri: "urn:ietf:wg:oauth:2.0:oob",
+          grant_type: "authorization_code"
+        )
+        if options[:save]
+          save_config_file(
+            access_token: token.access_token,
+            refresh_token: token.refresh_token,
+            created_at: token.created_at
+          )
+        else
+          puts "\nAccess token:\n#{token.access_token}\n"
+        end
+        if options[:verbose]
+          puts "Token details: #{token.to_h}"
+        end
+      rescue TimelyApp::Error => e
+        puts "Authentication failed"
+        if options[:verbose]
+          puts "Code: #{code}"
+          puts "Response code: #{e.response.code}"
+          puts "Response: #{e.response.body}"
+        end
+        exit 1
+      end
+    end
+
+    private
+
+    def config_file_path
+      Dir.home + "/.timelyrc"
+    end
+
+    def read_config_file
+      if File.exist?(config_file_path)
+        YAML.load_file(config_file_path)
+      end
+    end
+
+    def fetch_account_id
+      read_config_file&.fetch("account_id", nil)
+    end
+
+    def fetch_access_token
+      read_config_file&.fetch("access_token", nil)
+    end
+
+    def check_access_token
+      if !fetch_access_token
+        puts "No access token found. Run `timely-app auth` to get one."
+        exit 1
+      end
+    end
+
+    def save_config_file(**options)
+      config = read_config_file || {}
+      config.merge!(options)
+      File.open(config_file_path, "w") do |f|
+        f.write(config.to_yaml)
+      end
+      puts "Saved to #{config_file_path}"
+    end
+  end
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: timely-app [command] [options]"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+    options[:verbose] = v
+  end
+
+  opts.on("-a", "--account ACCOUNT", "Account name") do |a|
+    options[:account] = a
+  end
+
+  opts.on("-s", "--save", "Save changes to file") do |s|
+    options[:save] = s
+  end
+end.parse!
+
+cli = TimelyApp::CLI.new(options)
+
+cmd = ARGV.shift
+case cmd
+when "auth"
+  client_id = ARGV.shift || ENV.fetch('TIMELY_CLIENT_ID')
+  client_secret = ARGV.shift || ENV.fetch('TIMELY_CLIENT_SECRET')
+  ARGV.clear
+  if client_id && client_secret
+    cli.auth(client_id, client_secret)
+  else
+    puts "Usage: timely-app auth CLIENT_ID CLIENT_SECRET"
+    exit 1
+  end
+when "config"
+  if ARGV.length == 1
+    puts cli.get_config(ARGV.shift)
+  elsif ARGV.length == 2
+    cli.set_config(ARGV.shift, ARGV.shift)
+  else
+    puts "Usage: timely-app config [key] [value]"
+    exit 1
+  end
+else
+  if cli.command_exists?(cmd)
+    args = ARGV.reduce({}){ |h, arg| k, v = arg.split("="); h[k] = v; h }
+    ARGV.clear
+    response = cli.call(cmd, *args)
+    case response
+    when Array
+      response.each do |r|
+        puts r.to_h
+      end
+    when TimelyApp::Record
+      puts response.to_h
+    else
+      puts response
+    end
+  else
+    puts "Unknown command: #{cmd}"
+    exit 1
+  end
+end

data/lib/timely-app/version.rb

@@ -1,3 +1,3 @@
 module TimelyApp
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/timely-app.gemspec

@@ -1,20 +1,29 @@
 Gem::Specification.new do |s|
-  s.name = 'timely-app'
-  s.version = '1.0.2'
-  s.license = 'MIT'
+  s.name = "timely-app"
+  s.version = "1.0.4"
+
+  s.license = "MIT"
+
   s.platform = Gem::Platform::RUBY
-  s.authors = ['Andrei Makarov']
-  s.email = ['andrei@kiskolabs.com']
-  s.homepage = 'https://github.com/amkisko/timely-app'
-  s.description = 'Ruby client for the Timely API'
-  s.summary = 'See description'
-  s.files = Dir.glob('lib/**/*.rb') + %w(CHANGELOG.md LICENSE.md README.md timely-app.gemspec)
-  s.required_ruby_version = '>= 1.9.3'
-  s.require_path = 'lib'
+
+  s.authors = ["Andrei Makarov"]
+  s.email = ["andrei@kiskolabs.com"]
+  s.homepage = "https://github.com/amkisko/timely-app"
+  s.description = "Ruby client for the Timely API"
+  s.summary = "See description"
   s.metadata = {
-    'homepage' => 'https://github.com/amkisko/timely-app',
-    'source_code_uri' => 'https://github.com/amkisko/timely-app',
-    'bug_tracker_uri' => 'https://github.com/amkisko/timely-app/issues',
-    'changelog_uri' => 'https://github.com/amkisko/timely-app/blob/main/CHANGES.md'
+    "homepage" => "https://github.com/amkisko/timely-app",
+    "source_code_uri" => "https://github.com/amkisko/timely-app",
+    "bug_tracker_uri" => "https://github.com/amkisko/timely-app/issues",
+    "changelog_uri" => "https://github.com/amkisko/timely-app/blob/main/CHANGELOG.md",
+    "rubygems_mfa_required" => "true"
   }
+
+  s.files = Dir.glob("lib/**/*.rb") + Dir.glob("bin/**/*") + %w(CHANGELOG.md LICENSE.md README.md timely-app.gemspec)
+
+  s.bindir      = "bin"
+  s.executables = ["timely-app"]
+
+  s.required_ruby_version = ">= 1.9.3"
+  s.require_path = "lib"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timely-app
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Andrei Makarov
@@ -13,13 +13,15 @@ dependencies: []
 description: Ruby client for the Timely API
 email:
 - andrei@kiskolabs.com
-executables: []
+executables:
+- timely-app
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE.md
 - README.md
+- bin/timely-app
 - lib/timely-app.rb
 - lib/timely-app/client.rb
 - lib/timely-app/client/accounts.rb
@@ -50,7 +52,8 @@ metadata:
   homepage: https://github.com/amkisko/timely-app
   source_code_uri: https://github.com/amkisko/timely-app
   bug_tracker_uri: https://github.com/amkisko/timely-app/issues
-  changelog_uri: https://github.com/amkisko/timely-app/blob/main/CHANGES.md
+  changelog_uri: https://github.com/amkisko/timely-app/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: