bootic_cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1cd34aea083a13ac4498a6ec83efabf0f4f389a
-  data.tar.gz: 2f5067838d8dccbcbf5eac65176ea9081c76674d
+  metadata.gz: c4ace11ad0bee02a140f7a4312f4384d0398cd94
+  data.tar.gz: 8dcf28108c63796e137438d04773ce18fc40719f
 SHA512:
-  metadata.gz: 0f749cc6438d2d8cb8d5088787bde841a458a48e5485fe9f59e2ec54b42ce028301bee5f5159ba6239ef57904dd9055bef67ae39a3992001493627df588c54ad
-  data.tar.gz: 8a6fb2e8535280f8db5175d834f1b4a4ca2a1cb1ff64a9c80b0eb38af7efd9b672cb29d38896e0d8c0e7e004844eb1ded66156c5cd776d01f2569dad659b10c9
+  metadata.gz: 7acf5cf6b282cd2b60bd2fb563f5d30298f504baff415783f5fea34721cc56518985ed1e8876c1b1c1967a3d9c400f0e62b6731bbfbcd79684715850e4cfcdc5
+  data.tar.gz: 48ef1a967baea28dea4f01e8bc0c44439f4be0f7e3a54177bafaf9798ef4376ac21d8874c57603b758ae8929d9e876a283d0b4ee36057f92696e5447587175b1

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+examples

data/bootic_cli.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "byebug"
 
   spec.post_install_message = <<-END
 Bootic client installed.

data/lib/bootic_cli/cli.rb

@@ -7,23 +7,32 @@ module BooticCli
     include Thor::Actions
     include BooticCli::Connectivity
 
+    DEFAULT_ENV = 'production'.freeze
     CUSTOM_COMMANDS_DIR = ENV.fetch("BTC_CUSTOM_COMMANDS_PATH") { File.join(ENV["HOME"], "btc") }
 
+    class_option :environment, type: :string, default: DEFAULT_ENV, aliases: :e, banner: '<production>'
+
     desc 'setup', 'Setup OAuth2 application credentials'
     def setup
+      if options[:environment] != DEFAULT_ENV
+        auth_host     = ask("Enter auth endpoint host (#{BooticClient::AUTH_HOST}):").chomp
+        api_root      = ask("Enter API root (#{BooticClient::API_ROOT}):").chomp
+        auth_host = nil if auth_host == ""
+        api_root  = nil if api_root == ""
+      end
       client_id     = ask("Enter your application's client_id:")
       client_secret = ask("Enter your application's client_secret:")
 
-      session.setup(client_id, client_secret)
+      session.setup(client_id, client_secret, auth_host: auth_host, api_root: api_root)
 
-      say "Credentials stored. client_id: #{client_id}"
+      say "Credentials stored for #{options[:environment]} environment. client_id: #{client_id}"
     end
 
     desc 'login', 'Login to your Bootic account'
     def login(scope = 'admin')
       if !session.setup?
-        say "App not configured. Running setup first. You only need to do this once."
-        say "Please create an OAuth2 app and get its credentials at https://auth.bootic.net/dev/apps"
+        say "App not configured for #{options[:environment]} environment. Running setup first. You only need to do this once."
+        say "Please create an OAuth2 app and get its credentials at https://auth.bootic.net/dev/apps or the relevant auth app for your environment"
         invoke :setup, []
       end
 

data/lib/bootic_cli/connectivity.rb

@@ -8,7 +8,7 @@ module BooticCli
 
     def session
       @session ||= (
-        store = BooticCli::Store.new(ENV['HOME'])
+        store = BooticCli::Store.new(base_dir: ENV['HOME'], namespace: options[:environment])
         BooticCli::Session.new(store)
       )
     end
@@ -22,13 +22,18 @@ module BooticCli
     end
 
     def logged_in_action(&block)
+      if session.needs_upgrade?
+        say_status "WARNING", "old store data structure, restructuring to support multiple environments"
+        session.upgrade!
+      end
+
       if !session.setup?
-        say_status "ERROR", "No app credentials. Run btc setup", :red
+        say_status "ERROR", "No app credentials. Run btc setup -e #{options[:environment]}", :red
         return
       end
 
       if !session.logged_in?
-        say_status "ERROR", "No access token. Run btc login", :red
+        say_status "ERROR", "No access token. Run btc login -e #{options[:environment]}", :red
         return
       end
 

data/lib/bootic_cli/session.rb

@@ -8,6 +8,14 @@ module BooticCli
       @store = store
     end
 
+    def needs_upgrade?
+      store.needs_upgrade?
+    end
+
+    def upgrade!
+      store.upgrade!
+    end
+
     def setup?
       store.transaction do
         store['client_id'] && store['client_secret']
@@ -22,10 +30,14 @@ module BooticCli
       setup? && logged_in?
     end
 
-    def setup(client_id, client_secret)
+    def setup(client_id, client_secret, auth_host: nil, api_root: nil)
+      upgrade!
+
       store.transaction do
         store['client_id'] = client_id
         store['client_secret'] = client_secret
+        store['auth_host'] = auth_host if auth_host
+        store['api_root'] = api_root if api_root
       end
     end
 
@@ -49,11 +61,14 @@ module BooticCli
 
     def config
       @config ||= store.transaction do
-        {
+        h = {
           client_id: store['client_id'],
           client_secret: store['client_secret'],
           access_token: store['access_token']
         }
+        h[:auth_host] = store['auth_host'] if store['auth_host']
+        h[:api_root] = store['api_root'] if store['api_root']
+        h
       end
     end
 
@@ -77,6 +92,8 @@ module BooticCli
       @client ||= begin
         raise "First setup credentials and log in" unless ready?
         BooticClient.configure do |c|
+          c.auth_host = config[:auth_host] if config[:auth_host]
+          c.api_root = config[:api_root] if config[:api_root]
           c.client_id = config[:client_id]
           c.client_secret = config[:client_secret]
           c.logger = Logger.new(STDOUT)
@@ -98,7 +115,7 @@ module BooticCli
       @oauth_client ||= OAuth2::Client.new(
         config[:client_id],
         config[:client_secret],
-        site: BooticClient.auth_host
+        site: (config[:auth_host] || BooticClient.auth_host)
       )
     end
 

data/lib/bootic_cli/store.rb

@@ -4,21 +4,26 @@ require 'pstore'
 module BooticCli
 
   class Store
-
+    VERSION = 1
+    DEFAULT_NAMESPACE = 'production'.freeze
     DIRNAME = '.btc'.freeze
     FILE_NAME = 'store.pstore'.freeze
 
-    def initialize(base_dir = ENV['HOME'], dir = DIRNAME)
+    def initialize(base_dir: ENV['HOME'], dir: DIRNAME, namespace: DEFAULT_NAMESPACE)
       @base_dir = File.join(base_dir, dir)
+      @namespace = namespace
       FileUtils.mkdir_p @base_dir
     end
 
     def []=(k, v)
-      store[k] = v
+      hash = store[namespace] || {}
+      hash[k] = v
+      store[namespace] = hash
     end
 
     def [](k)
-      store[k]
+      hash = store[namespace] || {}
+      hash[k]
     end
 
     def transaction(&block)
@@ -29,9 +34,34 @@ module BooticCli
       FileUtils.rm_rf base_dir
     end
 
+    def needs_upgrade?
+      transaction do
+        store['version'].to_i < VERSION && store[DEFAULT_NAMESPACE].nil?
+      end
+    end
+
+    def upgrade!
+      return unless needs_upgrade?
+
+      transaction do
+        current_values = {}
+        store.roots.each do |r|
+          v = store[r]
+          store.delete(r)
+          current_values[r] = v
+        end
+
+        current_values.each do |k, v|
+          self[k] = v
+        end
+
+        self['version'] = VERSION
+      end
+    end
+
     private
 
-    attr_reader :base_dir
+    attr_reader :base_dir, :namespace
 
     def store
       @store ||= PStore.new(File.join(base_dir, FILE_NAME))

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bootic command line.
 email:
 - ismaelct@gmail.com