ood_appkit 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f7a7c25ba25d14150f6a7c4ce9d1c06750aa62
-  data.tar.gz: 876b6748f3b878847458bf43abc500d996251d81
+  metadata.gz: 5d9dd72dd897997eadf63e025a8e085a6ae842b7
+  data.tar.gz: 8db16a0e7b2c3e010412967a1c015288780dd212
 SHA512:
-  metadata.gz: 39a1037b54d435c90f6a6021ce8140e476d638542bebe76d1d4c4e3d5db13b0c4236bebadc59690b6eacd8020ee022898dad4c8a4cefdf5ff8e2d14eecb8ee3f
-  data.tar.gz: 8ad765fe7f3ab062f750d841a32adf8d8a62a8172789b0e222302f82ce7fe500a844c9aab0f26e7e724e85701068d3ccb164b5d26f5dd25574734d7b8a5b415c
+  metadata.gz: 35aad26d17cf8df49f4399b55f138c9959b795e4d16e6054593a6066ab364d0754ba25a24adfb3a35a9ebadaefe71d20aaed70bab2200612276789fc03c88cab
+  data.tar.gz: ecdf518bfded907f0faf195c4468d82f82e7ba3433cef67a64ba71dfffa87ebb4882b343c5f56c1bab0916048029c495f220130383e7b1cb740c1a402f793870

data/lib/ood_appkit/cluster.rb

@@ -6,6 +6,10 @@ module OodAppkit
     # YAML configuration version
     VERSION = :v1
 
+    # Unique ID of the cluster
+    # @return [Symbol] id of cluster
+    attr_reader :id
+
     # Title of the cluster
     # @return [String] title of cluster
     attr_reader :title
@@ -24,17 +28,19 @@ module OodAppkit
     # @return [Hash<Cluster>] list of clusters user has access to
     def self.all(file: File.expand_path('../../../config/clusters.yml', __FILE__), force: false)
       parse_config(file).each_with_object({}) do |(k, v), h|
-        c = Cluster.new v
+        c = Cluster.new v.merge(id: k)
         h[k] = c if c.valid? || force
       end
     end
 
+    # @param id [Symbol] id of cluster
     # @param title [String] title of cluster
     # @param validators [Hash] hash of validations that describe the validators
     # @param servers [Hash] hash of servers with corresponding server info
     # @param hpc_cluster [Boolean] whether this is an hpc-style cluster
-    def initialize(title:, validators: {}, servers: {}, hpc_cluster: true)
-      # Set title of cluster
+    def initialize(id:, title:, validators: {}, servers: {}, hpc_cluster: true)
+      # Set id & title of cluster
+      @id = id
       @title = title
 
       # Generate hash of validations

data/lib/ood_appkit/shell_url.rb

@@ -20,10 +20,10 @@ module OodAppkit
 
     # URL to access this app for a given host and absolute file path
     # @param host [String] the host the app will make an ssh connection with
-    # @param path [String, #to_s] the absolute path to the directory ssh app opens up in
+    # @param path [#to_s] the absolute path to the directory ssh app opens up in
     # @return [Addressable::URI] the url used to access the app
-    def url(path: '', host: 'default')
-      @template.expand url: @base_url + @ssh_url, path: path.to_s, host: host
+    def url(host: 'default', path: '')
+      @template.expand url: @base_url + @ssh_url, host: host, path: path.to_s
     end
   end
 end

data/lib/ood_appkit/version.rb

@@ -1,4 +1,4 @@
 module OodAppkit
   # The current version of OodAppkit
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_appkit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Eric Franz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails