bastion-cli 0.7.8 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f26c87173fd2fc37d108a782861a34df39ea08
-  data.tar.gz: 3e9985e5301214e164072f0ae969fd9763452bd3
+  metadata.gz: 30e468497b9e751497941893f0078bf70d8a7088
+  data.tar.gz: 78cbf4d372567df0e755ddb0b817c524b1068a27
 SHA512:
-  metadata.gz: 79cd0237e542b8d07b0293f72e874ccce896f931ca421b88bef8e8a4137502340f61601c7d62fafce53103510782de0c3970cfa235a652cf1d21e481395f7d71
-  data.tar.gz: c49ceabc5bb587f82c197a28e8ef5981787fea5e6e6650b9f8eda80d5fae7de7392077f762ee45f65757f0f9be2f33123b76ad8723a1d07516837727be80e36b
+  metadata.gz: 317f92619bf0623345d0bf153a6edda2a21ce3ace5e26dd165d18c2499eb2a9beb98ee57370fd17d80c67a860abd879b6a9fc23792ca32eed26c79da04194e30
+  data.tar.gz: 013eae5e5fdbe28d5fa10c69002e27e4faefac0072c5b574258382f6cffef0882ff9baefdfb0ee72d2e14a852454fd1e747833d2a63b13442a548d913734f570

data/{readme.md → Readme.md}

@@ -1,4 +1,4 @@
-# bastion-cli
+# bastion
 
 Log into things through bastions.
 
@@ -54,6 +54,9 @@ bastion host:
 
 The pecking order is:
 
-  - `BASTION_HOST` environment variable
-  - The default value that lives in `${HOME}/.bastion`
+  - The `--host` option
+  - The `BASTION_HOST` environment variable
+  - The user default value that lives in `/etc/bastion/bastion`
+  - The system default value that lives in `${HOME}/.bastion`
 
+In doubt, just run `bastion host --all` to see what are your options.

data/bin/bastion

@@ -1,16 +1,18 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)) + "/../lib")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + "/../lib"
 
 require "rubygems"
 require "thor"
 require "bastion"
 
 module Bastion
-  ### Main cli class
-  ###
+  # Main cli class
+  #
+  #
   class Cli < Thor
-    Config.load
+    class_option :host, type: :string
+    class_option :save, type: :boolean
+    class_option :v,    type: :boolean
 
     desc "version", "Shows current version"
     def version
@@ -18,38 +20,33 @@ module Bastion
     end
 
     desc "host [HOST]", "Show or set the default bastion host"
+    option :all, type: :boolean
     def host(address = nil)
-      return Config.save(address) if address
-      puts Config.host
+      config = Config.new(options)
+      return config.save(address) if address
+      return config.info if options[:all]
+      puts config.host
     end
 
     desc "ssh [INSTANCE]", "Logs into an instance"
-    option :host
-    option :save, type: :boolean
-    option :v, type: :boolean
     def ssh(instance = nil)
-      host = options[:host] || Config.host
+      config = Config.new(options)
       verb = options[:v] ? " -vvv" : ""
-      Config.save host if options[:save]
       if instance
-        puts "==> Using #{host}"
+        puts "==> Using #{config.host}"
         puts "==> Logging into #{instance}"
-        exec "ssh -A -t #{host} ssh #{instance}#{verb}"
+        exec "ssh -A -t #{config.host} ssh #{instance}#{verb}"
       else
-        puts "==> Logging into #{host}"
-        exec "ssh -A #{host}#{verb}"
+        puts "==> Logging into #{config.host}"
+        exec "ssh -A #{config.host}#{verb}"
       end
     end
 
     desc "tunnel [PORT]", "Starts a new tunnel"
-    option :host
-    option :save, type: :boolean
-    option :v, type: :boolean
     def tunnel(port = 1200)
-      host = options[:host] || Config.host
-      Config.save host if options[:save]
-      puts "==> Starting tunnel to host #{host} on port #{port}"
-      exec "ssh -D#{port} #{host}"
+      config = Config.new(options)
+      puts "==> Starting tunnel to host #{config.host} on port #{port}"
+      exec "ssh -D#{port} #{config.host}"
     end
 
     def method_missing(name)

data/lib/bastion/config.rb

@@ -3,28 +3,41 @@ module Bastion
   #
   #
   class Config
-    FILE    = "#{ENV['HOME']}/.bastion"
-    NAME    = "BASTION_HOST"
-    DEFAULT = "bastion.example.com"
+    USER   = "#{ENV['HOME']}/.bastion"
+    SYSTEM = "/etc/bastion/bastion"
+    ENVVAR = "BASTION_HOST"
 
-    def self.load
-      @@default = DEFAULT
-      @@env     = ENV[NAME]
-      begin
-        @@file = File.open(FILE, "r").read
-      rescue
-        @@file = nil
-      end
+    def initialize(options)
+      @system = read(SYSTEM)
+      @user   = read(USER)
+      @env    = ENV[ENVVAR]
+      @option = options[:host]
+      @host   = @option || @env || @user || @system
+      save @host if options[:save]
+    end
+
+    def info
+      puts "System : #{@system}"
+      puts "User   : #{@user}"
+      puts "Env    : #{@env}"
+      puts "Option : #{@option}"
+      puts "Used   : #{@host}"
+    end
 
-      @@host = @@env || @@file || @@default
+    def read(file, default = nil)
+      return default unless File.exist?(file)
+      value = File.read(file)
+      value.empty? ? nil : value
     end
 
-    def self.save(value)
-      File.write(FILE, value)
+    def save(value)
+      puts "Saved with value #{value}"
+      File.write USER, value
     end
 
-    def self.method_missing(name)
-      class_variable_get(:"@@#{name}")
+    def method_missing(name)
+      instance_variable_get :"@#{name}"
+      # class_variable_get(:"@@#{name}")
     end
   end
 end

data/lib/bastion/version.rb

@@ -1,4 +1,4 @@
 
 module Bastion
-  VERSION = "0.7.8"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bastion-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - ptdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -65,13 +65,12 @@ files:
 - .travis.yml
 - Gemfile
 - Rakefile
+- Readme.md
 - bastion-cli.gemspec
 - bin/bastion
 - lib/bastion.rb
 - lib/bastion/config.rb
 - lib/bastion/version.rb
-- license.txt
-- readme.md
 homepage: https://github.com/ptdorf/bastion-cli
 licenses:
 - MIT

data/license.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2016 ptdorf
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.