bcl 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccb692d80b81a714f5be282d2825f69b7120566a
-  data.tar.gz: ed52608fbf6a8a1361383d9bf84b873de86f2c0c
+  metadata.gz: d33942d293d67bd8ac6595d462269ff40bf5a66e
+  data.tar.gz: 664e9df16a4f06cd0e5785f2596aaaafc3ab2dba
 SHA512:
-  metadata.gz: 5e73d288bb23e28b1b9d8e5d8cb45adb9af0141cb8907dacf88c0f1fac8f5a9e0d364fa2a4f4a1ba20b5d6791f8add521bfd77f53172585e1b96a065c2349af3
-  data.tar.gz: e53eecf1df441852fbdfb015742f8077ee8af946304e6b13c32930b5c33b5c94ad1fef87a7b6b913aeadb86449760bc953986f64f608d29a8375d386f3a3372a
+  metadata.gz: 1fa0f9dc57b106fbe903056e614f441f30af2f478cfd7e410e6270b05ef869ae959f3b26a4f988f1682c130e38668521f19c5868533a976b75dd6367dced02c3
+  data.tar.gz: 9f3bf501251c98d91674994f306d7e79b3f9c61d2785f1eb5b31f43b192d494b42977e5564f3d711a17f409edebb0307e51a43a1da7b4a3e34c92ff46afa6e76

data/lib/bcl/component_methods.rb

@@ -40,23 +40,20 @@ module BCL
     attr_accessor :http
     attr_accessor :parsed_measures_path
 
-    def initialize(group_id = nil)
+    def initialize()
       @parsed_measures_path = './measures/parsed/'
       @config = nil
       @session = nil
       @access_token = nil
       @http = nil
       @api_version = 2.0
-      @group_id = group_id.nil? ? 32 : group_id #set group to NREL (32) if nil
+      @group_id = nil 
 
-      
       load_config
     end
 
-    
-
 
-    def login(username=nil, password=nil, url=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]
@@ -76,10 +73,15 @@ module BCL
         puts "logging in using credentials in .bcl/config.yml: Connecting to #{url} on port #{port} as #{username}"
         username = @config[:server][:user][:username]
         password = @config[:server][:user][:password]
+        @group_id = group_id || @config[:server][:user][:group]
       else
         puts "logging in using credentials in function arguments: Connecting to #{url} on port #{port} as #{username}"
       end
 
+      if @group_id.nil?
+        puts "[WARNING] You did not set a group ID in your config.yml file. You can retrieve your group ID from the node number of your group page (e.g., https://bcl.nrel.gov/node/32). Will continue, but you will not be able to upload content."
+      end
+      
       @http = Net::HTTP.new(url, port)
       if port == 443
         @http.use_ssl = true
@@ -163,13 +165,13 @@ module BCL
     def measure_metadata(search_term = nil, filter_term=nil, return_all_pages = false)
 
       #setup results directory
-      if !Dir.exists?(@parsed_measures_path)
+      if !File.exists?(@parsed_measures_path)
         FileUtils.mkdir_p(@parsed_measures_path)
       end
       puts "...storing parsed metadata in #{@parsed_measures_path}"
 
       #retrieve measures
-      puts "retrieving measures that match search_term: #{search_term.nil? ? "nil":search_term} and filters: #{filter_term.nil? ? "nil":filter_term}"
+      puts "retrieving measures that match search_term: #{search_term.nil? ? "nil" :search_term} and filters: #{filter_term.nil? ? "nil" :filter_term}"
       retrieve_measures(search_term, filter_term, return_all_pages) do |measure|
         #parse and save
         parse_measure_metadata(measure)
@@ -229,7 +231,7 @@ module BCL
               end
 
               # move the directory to the class name
-              FileUtils.rm_rf(measure_hash[:path]) if Dir.exists?(measure_hash[:path]) && temp_dir_name != measure_hash[:path]
+              FileUtils.rm_rf(measure_hash[:path]) if File.exists?(measure_hash[:path]) && temp_dir_name != measure_hash[:path]
               FileUtils.move(temp_dir_name, measure_hash[:path]) unless temp_dir_name == measure_hash[:path]
 
               measure_hash[:arguments] = []
@@ -339,10 +341,10 @@ module BCL
           "node" =>
               {
                   "type" => "#{content_type}",
-                  "field_component_tags" =>  #TODO remove this field_component_tags once BCL is fixed
-                    {
-                      "und" => "1289"
-                    },
+                  "field_component_tags" => #TODO remove this field_component_tags once BCL is fixed
+                      {
+                          "und" => "1289"
+                      },
                   "og_group_ref" =>
                       {
                           "und" =>
@@ -608,7 +610,7 @@ module BCL
       end
     end
 
-     # Delete receipt files
+    # Delete receipt files
     def delete_receipts(array_of_components)
       array_of_components.each do |comp|
         receipt_file = File.dirname(comp) + "/" + File.basename(comp, '.tar.gz') + ".receipt"
@@ -621,7 +623,7 @@ module BCL
 
     def list_all_measures()
       json = search(nil, "fq[]=bundle%3Anrel_measure&show_rows=100")
-      
+
       json
     end
 
@@ -665,9 +667,18 @@ module BCL
         puts "******** Please fill in user credentials in #{config_filename} file if you need to upload data **********"
       end
     end
-    
+
     def default_yaml
-      settings = {:server => {:url => "https://bcl.nrel.gov", :user => {:username => "ENTER_BCL_USERNAME", :password => "ENTER_BCL_PASSWORD"}}}
+      settings = {
+          :server => {
+              :url => "https://bcl.nrel.gov",
+              :user => {
+                  :username => "ENTER_BCL_USERNAME",
+                  :password => "ENTER_BCL_PASSWORD",
+                  :group => "ENTER_GROUP_ID"
+              }
+          }
+      }
 
       settings
     end

data/lib/bcl/version.rb

@@ -18,5 +18,5 @@
 ######################################################################
 
 module BCL
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Daniel Macumber
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -111,6 +111,90 @@ dependencies:
     - - '>='
       - !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: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.25.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.25.1
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.10.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.10.3
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.10
 description: This gem contains helper methods for generating the Component XML file
   needed to upload files to the Building Component Library. It also contains the classes
   needed for logging in via the api and uploading generating components
@@ -150,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Classes for creating component XML files for the BCL