bcl 0.5.6 → 0.5.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9b595f2fbb18ac0cdf885c9cd7c94595272a0e6
-  data.tar.gz: 4a9f7d8789ae367ad26e2b1a139c2f781aefbe45
+  metadata.gz: 35f0906c51b3ebb744a4980ed17a074f6221b19d
+  data.tar.gz: 59bf6f68230139b3a8032954f87f4063cfb03fb9
 SHA512:
-  metadata.gz: 28a7fa4ba6ab4cca1fece24b9928d2d82e440814b6c4d92126e4792d74bc6c0cff1716218d72a2a2610529feafa354ff916a0621f3c53733038de155d7efb897
-  data.tar.gz: cfa0c7c21b956deadfdb992324b8af6da997a0c8f3ac3a9e109de44d59c981dcb77a9f39593a3206f10c884557b27edce32bf4a8ced57ab221f60a4843b80140
+  metadata.gz: 3fd9470fcb35faccde668b6230fedd7a63938ed63a32019b4dae7076ab83c0ba503f1524548ffdfb43647f87a62712712e06f686db593f85bc0700674a533a7f
+  data.tar.gz: 9f8d0e630fa89c9700020d056d0f823c347a49d5de1febcd399efc9a502585da8befa00d428c17a222f12b5007a825365c18ad232014c107f3dd6683e746363a

data/lib/bcl/component_methods.rb

@@ -38,7 +38,7 @@ module BCL
       load_config
     end
 
-    def login(username = nil, password = nil, url = nil, group_id = nil)
+     def login(username = nil, secret = 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? || password.nil?
-        # log in via cached creditials
+      if username.nil? || secret.nil?
+        # log in via cached credentials
         username = @config[:server][:user][:username]
-        password = @config[:server][:user][:password]
+        secret = @config[:server][:user][:secret]
         @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,10 +74,9 @@ module BCL
         @http.use_ssl = true
       end
 
-      data = %({"username":"#{username}","password":"#{password}"})
-      # data = {"username" => username, "password" => password}
+      data = %({"username":"#{username}","secret":"#{secret}"})
 
-      login_path = '/api/user/login.json'
+      login_path = '/api/user/loginsso.json'
       headers = { 'Content-Type' => 'application/json' }
 
       res = @http.post(login_path, data, headers)
@@ -634,7 +633,7 @@ module BCL
     end
 
     # pushes component to the bcl and publishes them (if logged-in as BCL Website Admin user).
-    # username, password, and group_id are set in the ~/.bcl/config.yml file
+    # username, secret, 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?
@@ -662,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 password set in ~/.bcl/config.yml file
+    # username and secret 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
 
@@ -917,7 +916,7 @@ module BCL
           url: 'https://bcl.nrel.gov',
           user: {
             username: 'ENTER_BCL_USERNAME',
-            password: 'ENTER_BCL_PASSWORD',
+            secret: 'ENTER_BCL_SECRET',
             group: 'ENTER_GROUP_ID'
           }
         }

data/lib/bcl/core_ext.rb

@@ -19,11 +19,21 @@
 
 class String
   def to_underscore
-    gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .tr('-', '_')
-      .downcase
+    gsub('OpenStudio','Openstudio')
+        .gsub('EnergyPlus','Energyplus')
+        .gsub(/::/, '/')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr('-', '_')
+        .tr(' ', '_')
+        .squeeze('_')
+        .downcase
+  end
+
+  def to_bool
+    return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
+    return false if self == false || self =~ (/(false|f|no|n|0)$/i)
+    fail "invalid value for Boolean: '#{self}'"
   end
 
   # simple method to create titles -- very custom to catch known inflections

data/lib/bcl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcl
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7.pre
 platform: ruby
 authors:
 - Daniel Macumber
@@ -11,160 +11,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: zliby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yamler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem contains helper methods for generating the Component XML file
@@ -197,14 +197,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5