neptune_apex 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc8ffa43bd65e6f68071b9c4c88d08b5733ff076
-  data.tar.gz: d36aa42af0b4e5f7d3f638d1a913d065a5eef6e2
+  metadata.gz: f59db0922af8e08941de89c436b976366a916823
+  data.tar.gz: 05acb8292136d50a2edaf7d207dd8187d93eb70a
 SHA512:
-  metadata.gz: 43318cb0eb0bd69592bf38459427cc5bf4772e9d287f7e6b67909e0c957cd7a341c6c792f46da957ad2c7a1165602e17c0c934e235ea999e548e202c05ad8680
-  data.tar.gz: ae125a0da2674874e2c0accb60bbedcf4e3b9ae6f2424aa3d86a6c18700ec0a6e356320ee7113076fc12066d676bc8de4e07caaac3b2f83128c213e6fa61c6df
+  metadata.gz: 46554e8977fd5e7289713946ebc61e915d93334f137b70abccbeb42ddee4cffeac855d461e0b9c98ffabe5f5b4685e0393969364fc7abfc3ab0fbf2f73c6fa73
+  data.tar.gz: 18967d5eb9a0baf916bdca64164947b0ada69f5eb1fbe8969c8bdddf5727a39c481a063e5dace31cc23a2e10a16fafa3fd1b59fd77a82c3249a2aee09934343f

data/lib/neptune_apex/cli/main.rb

@@ -9,7 +9,7 @@ module NeptuneApex
     class Main < Thor
       desc "status", "Get current status of controller outlets & probes"
       def status
-        cont = NeptuneApex::Controller.new()
+        cont = create_controller
         status = cont.status
 
         puts "Apex status as of #{status.date.strftime('%F %R')}"
@@ -39,6 +39,30 @@ module NeptuneApex
 
       desc "profile SUBCOMMAND", "manage profiles"
       subcommand "profile", ProfileCli
+
+
+      private
+        ##
+        # Look for a config file & load
+        def create_controller
+          conf_file = File.expand_path('~/.apexcli')
+
+          if ENV['APEXCONF']
+            conf_file = ENV['APEXCONF']
+          end
+
+          if File.exist?(conf_file)
+            controller = NeptuneApex::Controller.new()
+            conf = YAML.load_file(conf_file)
+            controller.url = conf['url']
+            controller.user = conf['user']
+            controller.password = conf['password']
+            return controller
+          else
+            raise Exception.new('Config file not found!')
+          end
+        end
+
     end
   end
 end

data/lib/neptune_apex/controller.rb

@@ -14,34 +14,6 @@ module NeptuneApex
     attr_accessor :password
 
 
-    def initialize(url=nil)
-      load_conf
-
-      if url
-        @url = url
-      end
-    end
-
-    ##
-    # Look for a config file & load
-    def load_conf
-      conf_file = File.expand_path('~/.apexcli')
-
-      if ENV['APEXCONF']
-        conf_file = ENV['APEXCONF']
-      end
-
-      if File.exist?(conf_file)
-        conf = YAML.load_file(conf_file)
-        @url = conf['url']
-        @user = conf['user']
-        @password = conf['password']
-      else
-        raise Exception.new('Config file not found!')
-      end
-    end
-
-
     ##
     # Get the current status of the controller
     def status

data/lib/neptune_apex/version.rb

@@ -1,3 +1,3 @@
 module NeptuneApex
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neptune_apex
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Scott Peshak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri