csl_cli 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b44c1a894b6a6c6743acbc1cd4e86425496a41ed
-  data.tar.gz: 65e1d0c3865abf58d239cec2d4d7692be14f93cf
+  metadata.gz: cc6bd13b3fa8931bd954b5cfa633847f782f1286
+  data.tar.gz: 4125d07f37a301af9c2d6fe6eb184ea75cc93344
 SHA512:
-  metadata.gz: 7fcfa4be924334654a1d0a9fbd60faaf77b29caaf4d6db04ff55524c389d5c3afa31b0325b4f51c64e23e5bfd864d7f6eb8982fe256edc7aeff1a426d3477adc
-  data.tar.gz: '09165265c5853115c8d9ea06bac7d05b0e8e2e8832ac102a726a9ccca268b6b6902e5cf6c94e0bda55a504cf2664eefc55ec1470580d6b22883655aa284e869f'
+  metadata.gz: d757d071af172779a51ec503d2b9c50ec00b7f0dcd7c0e6e4450ed219a12eb7ea098f557756805d19548d27722c6d83d4e698653369bd5f03955227cdb7b574f
+  data.tar.gz: 80768a11f7f4dca1bc93c5acccb3e6bc94f65ffe4eb210d078d506c11b5f438a2c58d49d4fed343ea7562fd4af05960a15be1ace0b3aebf808f71b28d020a607

data/lib/csl_cli/cli.rb

@@ -9,9 +9,20 @@ module CslCli
 
     desc 'login', 'Log in at csl app using environmet variables (csl_cli_email, csl_cli_password, csl_cli_app_url)'
     def login
-      email = ENV['CSL_CLI_EMAIL']
-      password = ENV['CSL_CLI_PASSWORD']
-      app_url = ENV['CSL_CLI_APP_URL']
+      configloader = CslCli::Config.new(ENV['HOME'])
+      config = configloader.load
+
+      if config != false
+        puts "Loaded config from .csv_config.json"
+        email = config['email']
+        password = config['password']
+        app_url = config['app_url']
+      else
+        puts "Loaded config from ENV"
+        email = ENV['CSL_CLI_EMAIL']
+        password = ENV['CSL_CLI_PASSWORD']
+        app_url = ENV['CSL_CLI_APP_URL']
+      end
 
       abort 'email missing, please check environment variables' if email.nil?
       abort 'password missing, please check environment variables' if password.nil?
@@ -42,7 +53,14 @@ module CslCli
       token = nil
       decoded_token = {}
 
-      app_url = ENV['CSL_CLI_APP_URL']
+      configloader = CslCli::Config.new(ENV['HOME'])
+      config = configloader.load
+
+      if config != false
+        app_url = config['app_url']
+      else
+        app_url = ENV['CSL_CLI_APP_URL']
+      end
 
       abort 'app_url missing, please check environment variables' if app_url.nil?
 
@@ -75,7 +93,14 @@ module CslCli
       decoded_token = {}
       query = ""
 
-      app_url = ENV['CSL_CLI_APP_URL']
+      configloader = CslCli::Config.new(ENV['HOME'])
+      config = configloader.load
+
+      if config != false
+        app_url = config['app_url']
+      else
+        app_url = ENV['CSL_CLI_APP_URL']
+      end
 
       abort 'app_url missing, please check environment variables' if app_url.nil?
 

data/lib/csl_cli/config.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require 'json'
+
+module CslCli
+  class Config
+
+    @path = nil
+    @configfile = nil
+
+    def initialize(path)
+      @path = path
+      @configfile = File.join(@path, '.csl_config.json')
+    end
+
+    def load
+      begin
+        file = File.open(@configfile, 'rb')
+        config = JSON.parse(file.read())
+        file.close
+        return config
+      rescue
+        return false
+      end
+    end
+
+  end
+end

data/lib/csl_cli/version.rb

@@ -1,3 +1,3 @@
 module CslCli
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/lib/csl_cli.rb

@@ -4,4 +4,5 @@ module CslCli
   autoload 'Request', 'csl_cli/request'
   autoload 'Auth', 'csl_cli/auth'
   autoload 'Tokenstore', 'csl_cli/tokenstore'
+  autoload 'Config', 'csl_cli/config'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl_cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Nils Bartels
@@ -131,6 +131,7 @@ files:
 - lib/csl_cli.rb
 - lib/csl_cli/auth.rb
 - lib/csl_cli/cli.rb
+- lib/csl_cli/config.rb
 - lib/csl_cli/request.rb
 - lib/csl_cli/tokenstore.rb
 - lib/csl_cli/version.rb