bcl 0.5.7.pre → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f0906c51b3ebb744a4980ed17a074f6221b19d
-  data.tar.gz: 59bf6f68230139b3a8032954f87f4063cfb03fb9
+  metadata.gz: 317f08f02e79fd41f98a711a6cff460d55125fd0
+  data.tar.gz: 3c29a18af6c83f742537e00a96f422f5e5dc8500
 SHA512:
-  metadata.gz: 3fd9470fcb35faccde668b6230fedd7a63938ed63a32019b4dae7076ab83c0ba503f1524548ffdfb43647f87a62712712e06f686db593f85bc0700674a533a7f
-  data.tar.gz: 9f8d0e630fa89c9700020d056d0f823c347a49d5de1febcd399efc9a502585da8befa00d428c17a222f12b5007a825365c18ad232014c107f3dd6683e746363a
+  metadata.gz: 9023fdac7c3cfbb86e8e38ac776eb2483b87123936c90785a62f98c00870dde73bafa3e0f1cd56f1cd415b357032921befaa9b81fd6b104689722f50ae53ca12
+  data.tar.gz: 98e2043d5d609d8a29cfc080c76d2269d836221e3a94c33e41102f85d57031882815abe747ceae0b73a341ee47f582df2c393ad0ca5e03f20cd5b2822ce4dbcf

data/lib/bcl/component_methods.rb

@@ -38,7 +38,7 @@ module BCL
       load_config
     end
 
-     def login(username = nil, secret = nil, url = nil, group_id = nil)
+     def login(username = nil, password = nil, url = nil, group_id = nil)
       # figure out what url to use
       if url.nil?
         url = @config[:server][:url]
@@ -53,10 +53,10 @@ module BCL
       url = url.gsub('http://', '')
       url = url.gsub('https://', '')
 
-      if username.nil? || secret.nil?
+      if username.nil? || passwrord.nil?
         # log in via cached credentials
         username = @config[:server][:user][:username]
-        secret = @config[:server][:user][:secret]
+        password = @config[:server][:user][:password]
         @group_id = group_id || @config[:server][:user][:group]
         puts "logging in using credentials in .bcl/config.yml: Connecting to #{url} on port #{port} as #{username} with group #{@group_id}"
       else
@@ -74,9 +74,9 @@ module BCL
         @http.use_ssl = true
       end
 
-      data = %({"username":"#{username}","secret":"#{secret}"})
+      data = %({"username":"#{username}","password":"#{password}"})
 
-      login_path = '/api/user/loginsso.json'
+      login_path = '/api/user/login.json'
       headers = { 'Content-Type' => 'application/json' }
 
       res = @http.post(login_path, data, headers)
@@ -633,7 +633,7 @@ module BCL
     end
 
     # pushes component to the bcl and publishes them (if logged-in as BCL Website Admin user).
-    # username, secret, and group_id are set in the ~/.bcl/config.yml file
+    # username, password, and group_id are set in the ~/.bcl/config.yml file
     def push_content(filename_and_path, write_receipt_file, content_type)
       fail 'Please login before pushing components' if @session.nil?
       fail 'Do not have a valid access token; try again' if @access_token.nil?
@@ -661,7 +661,7 @@ module BCL
     end
 
     # pushes updated content to the bcl and publishes it (if logged-in as BCL Website Admin user).
-    # username and secret set in ~/.bcl/config.yml file
+    # username and password set in ~/.bcl/config.yml file
     def update_content(filename_and_path, write_receipt_file, uuid = nil)
       fail 'Please login before pushing components' unless @session
 
@@ -916,7 +916,7 @@ module BCL
           url: 'https://bcl.nrel.gov',
           user: {
             username: 'ENTER_BCL_USERNAME',
-            secret: 'ENTER_BCL_SECRET',
+            password: 'ENTER_BCL_PASSWORD',
             group: 'ENTER_GROUP_ID'
           }
         }

data/lib/bcl/version.rb

@@ -18,5 +18,5 @@
 ######################################################################
 
 module BCL
-  VERSION = '0.5.7.pre'
+  VERSION = '0.5.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcl
 version: !ruby/object:Gem::Version
-  version: 0.5.7.pre
+  version: 0.5.8
 platform: ruby
 authors:
 - Daniel Macumber
@@ -202,9 +202,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5