bcl 0.2.3 → 0.2.9

data/lib/bcl/component_methods.rb

@@ -27,7 +27,9 @@ require 'base64'
 # required gems
 require 'json/pure'
 require 'bcl/tar_ball'
-require 'rest-client'
+#require 'rest-client'
+require 'net/https'
+require 'libxml'
 
 module BCL
 
@@ -35,10 +37,12 @@ module BCL
 
     attr_accessor :config
     attr_accessor :session
+    attr_accessor :http
 
     def initialize()
       @config = nil
       @session = nil
+      @http = nil
       @api_version = 2.0
       config_path = File.expand_path('~') + '/.bcl'
       config_name = 'config.yml'
@@ -68,26 +72,106 @@ module BCL
         username = @config[:server][:admin_user][:username]
         password = @config[:server][:admin_user][:password]
       end
-
-      data = {"username" => username, "password" => password}
-      res = RestClient.post "#{@config[:server][:url]}/api/user/login", data.to_json, :content_type => :json, :accept => :json
-
-      if res.code == 200
+	
+      #figure out what time to use
+		url = @config[:server][:url]
+		#look for http vs. https
+		if url.include? "https"
+		  port = 443
+		else
+		  port = 80
+		end
+		#strip out http(s)
+		url = url.gsub('http://', '')
+		url = url.gsub('https://', '')
+		
+		puts "Connecting to #{url} on port #{port}"
+      
+      @http = Net::HTTP.new(url, port)
+      @http.use_ssl = true
+      
+      data = %Q({"username":"#{username}","password":"#{password}"})
+      #data = {"username" => username, "password" => password}
+      
+      path = "/api/user/login.json?"
+      headers = {'Content-Type' => 'application/json'}
+
+      res, data = @http.post(path, data, headers)
+      
+		#restClient wasn't working
+      #res = RestClient.post "#{@config[:server][:url]}/api/user/login", data.to_json, :content_type => :json, :accept => :json
+		  
+      if res.code == '200'
+      
+=begin
+		  #OLD RESTCLIENT CODE
         #pull out the session key
         res_j = JSON.parse(res.body)
-
         sessid = res_j["sessid"]
         session_name = res_j["session_name"]
 
-        @session = { session_name => sessid }
-
+			puts "**** RETURNED COOKIES: #{res.cookies.inspect}"
+			#pull out the BNES key and BNI key
+			bnes_name = ""
+			bnesid = ""
+			bni_name = ""
+			bni_id = ""
+			junkout = res.cookies
+			junkout.each do |key, val|
+			  if key.include?("BNES_SESS")
+				 bnes_name = key.to_s
+				 bnesid = val.to_s
+			  end
+			end
+			junkout.each do |key, val|
+			  if key.include?("BNI_bcl")
+				bni_name = key.to_s
+				bni_id = val.to_s
+			  end
+			end
+			#@session = { session_name => sessid, bnes_name => bnesid }
+			#@session = {session_name => URI.unescape(sessid), bnes_name => URI.unescape(bnesid)}
+			@session = {session_name => sessid,bnes_name => bnesid,bni_name => bni_id}
+		
+=end
+		
+			bnes = ""
+			bni = ""
+			junkout = res["set-cookie"].split(";")
+			junkout.each do |line|
+			  if line =~ /BNES_SESS/
+				 bnes = line.match(/(BNES_SESS.*)/)[0]
+			  end
+			end
+
+			junkout.each do |line|
+			  if line =~ /BNI/
+				 bni = line.match(/(BNI.*)/)[0]
+			  end
+			end
+
+			#puts "DATA: #{data}"
+			session_name = ""
+			sessid = ""
+			json = JSON.parse(data)
+			json.each do |key, val| 
+				if key == 'session_name'
+					session_name = val
+				elsif key == 'sessid'
+					sessid = val
+				end
+			end
+
+			@session = session_name + '=' + sessid + ';' + bni + ";" + bnes
+				
+			puts "SESSION COOKIE: #{@session}"
       end
-
+		
       res
     end
 
 
-    # pushes component to the bcl and sets to published (for now). Username and password and
+    # pushes component to the bcl and publishes them (if updated as admin user). Username and password and
     # set in ~/.bcl/config.yml file which determines the permissions and the group to which
     # the component will be uploaded
     def push_content(filename_and_path, write_receipt_file, content_type)
@@ -108,26 +192,34 @@ module BCL
                    },
                "node" =>
                      {
-                        "type" => "#{content_type}"#,
-                        #"status" => 1  #NOTE THIS ONLY WORKS IF YOU ARE ADMIN
+                        "type" => "#{content_type}",
+                        "publish" => 1  #NOTE THIS ONLY WORKS IF YOU ARE ADMIN
                      }
                 }
-
-      res = RestClient.post "#{@config[:server][:url]}/api/content", @data.to_json, :content_type => :json, :cookies => @session, :accept => :json
-	    
-      if res.code == 200
+					 
+		#restclient not working
+      #res = RestClient.post "#{@config[:server][:url]}/api/content.json", @data.to_json, :content_type => :json, :cookies => @session
+	   
+		path = "/api/content.json"	 
+		headers = {'Content-Type' => 'application/json', 'Cookie' => @session}
+
+		res, data = @http.post(path, @data.to_json, headers)		
+		 
+      if res.code == '200'
         res_j = JSON.parse(res.body)
 
-        if res.code == 200
+        if res.code == '200'
           valid = true
-        elsif res.code == 500
+        elsif res.code == '500'
           raise "server exception"
           valid = false
         else
           valid = false
+			 puts "error #{res.code}"
         end
       else
-        res = nil
+        puts "error code: #{res.code}"
+        res = nil	
       end
 
       if valid
@@ -161,6 +253,105 @@ module BCL
 
       logs
     end
+	
+    # pushes updated component to the bcl and publishes them (if updated as admin user). Username and password and
+    # set in ~/.bcl/config.yml file which determines the permissions and the group to which
+    # the component will be uploaded
+    def update_content(filename_and_path, write_receipt_file, uuid)
+      raise "Please login before pushing components" if @session.nil?
+
+      valid = false
+      res_j = nil
+      filename = File.basename(filename_and_path)
+      filepath = File.dirname(filename_and_path) + "/"
+
+      file = File.open(filename_and_path, 'rb')
+      file_b64 = Base64.encode64(file.read)
+      @data = {"file" =>
+                   {
+                       "file" => "#{file_b64}",
+                       "filesize" => "#{File.size(filename_and_path)}",
+                       "filename" => filename
+                   },
+               "node" =>
+                     {
+                        "uuid" => "#{uuid}",
+                        "publish" => 1  #NOTE THIS ONLY WORKS IF YOU ARE ADMIN
+                     }
+                }
+		
+		#restclient not working
+		#res = RestClient.post "#{@config[:server][:url]}/api/content", @data.to_json, :content_type => :json, :cookies => @session, :accept => :json   
+
+		path = "/api/content.json"	 
+		headers = {'Content-Type' => 'application/json', 'Cookie' => @session}
+
+		res, data = @http.post(path, @data.to_json, headers)
+				
+      if res.code == '200'
+        res_j = JSON.parse(res.body)
+
+        if res.code == '200'
+          valid = true
+        elsif res.code == '500'
+          raise "server exception"
+          valid = false
+        else
+          valid = false
+        end
+      else
+        puts "error code: #{res.code}"
+        res = nil
+      end
+
+      if valid
+        #write out a receipt file into the same directory of the component with the same file name as
+        #the component
+        if write_receipt_file
+          File.open(filepath + File.basename(filename, '.tar.gz') + ".receipt", 'w') do |file|
+            file << Time.now.to_s
+          end
+        end
+      end
+
+      [valid, res_j]
+    end
+	
+	def update_contents(array_of_components, skip_files_with_receipts)
+	  logs = []
+	  array_of_components.each do |comp|
+		receipt_file = File.dirname(comp) + "/" + File.basename(comp, '.tar.gz') + ".receipt"
+		log_message = ""
+		if skip_files_with_receipts && File.exists?(receipt_file)
+		  log_message = "skipping component because found receipt for #{comp}"
+		else
+		  #extract uuid
+      if File.exists?(File.dirname(comp) + "/component.xml")
+        xml_filename = File.dirname(comp) + "/component.xml"
+      elsif File.exists?("#{Dir.pwd}/instances/#{File.basename(comp, '.tar.gz')}/measure.xml")
+        xml_filename = "#{Dir.pwd}/instances/#{File.basename(comp, '.tar.gz')}/measure.xml"		  
+      else
+        puts "could not find component.xml or measure.xml"
+        next
+      end
+      parser = LibXML::XML::Parser.file(xml_filename)
+		  xml_file = parser.parse
+		  uid_node = xml_file.find('uid').first
+		  uuid = uid_node.content
+		  if uuid == nil
+			log_message "ERROR: uuid not found for #{File.basename(comp)}"
+			puts log_message
+		  else
+			log_message = "pushing updated component #{uuid}: #{File.basename(comp)}"
+			puts log_message
+			valid, res = update_content(comp, true, uuid)
+			log_message += " #{valid} #{res.inspect.chomp}"
+		  end
+		end
+		logs << log_message
+	  end
+      logs		
+	end
 
     # Simple method to search bcl and return the result as an XML object
     def search(search_str)
@@ -170,12 +361,24 @@ module BCL
 
       xml
     end
+	
+	# 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"
+		if File.exists?(receipt_file)
+		  FileUtils.remove_file(receipt_file)
+		
+		end
+	  end
+	end
+	
 
   end
 
   # TODO make this extend the component_xml class (or create a super class around components)
 
-  def BCL.gather_components(component_dir, chunk_size = 0, delete_previous_gather = false)
+  def BCL.gather_components(component_dir, chunk_size = 0, delete_previousgather = false)
     @dest_filename = "components"
     @dest_file_ext = "tar.gz"
 
@@ -189,7 +392,7 @@ module BCL
     Dir.chdir(component_dir)
 
     # delete any old versions of the component chunks
-    FileUtils.rm_rf("./_gather") if delete_previous_gather
+    FileUtils.rm_rf("./gather") if delete_previousgather
 
     #gather all the components into array
     targzs = Pathname.glob("./**/*.tar.gz")
@@ -201,29 +404,30 @@ module BCL
       end
       tar_cnt += 1
 
-      destination_path = "./_gather/#{chunk_cnt}"
+      destination_path = "./gather/#{chunk_cnt}"
       FileUtils.mkdir_p(destination_path)
       destination_file = "#{destination_path}/#{File.basename(targz.to_s)}"
-      puts "copying #{targz.to_s} to #{destination_file}"
+      #puts "copying #{targz.to_s} to #{destination_file}"
       FileUtils.cp(targz.to_s, destination_file)
     end
 
     #gather all the zip files into a single tar.gz
     (1..chunk_cnt).each do |cnt|
       currentdir = Dir.pwd
-
+      
       paths = []
-      Pathname.glob("./_gather/#{cnt}/*.tar.gz").each do |pt|
+      Pathname.glob("./gather/#{cnt}/*.tar.gz").each do |pt|
         paths << File.basename(pt.to_s)
       end
 
-      Dir.chdir("./_gather/#{cnt}")
+      Dir.chdir("./gather/#{cnt}")
       destination = "#{@dest_filename}_#{cnt}.#{@dest_file_ext}"
+      puts "tarring batch #{cnt} of #{chunk_cnt} to #{@dest_filename}_#{cnt}.#{@dest_file_ext}"
       BCL.tarball(destination, paths)
       Dir.chdir(currentdir)
 
       #move the tarball back a directory
-      FileUtils.move("./_gather/#{cnt}/#{destination}", "./_gather/#{destination}")
+      FileUtils.move("./gather/#{cnt}/#{destination}", "./gather/#{destination}")
     end
 
     Dir.chdir(current_dir)

data/lib/bcl/component_spreadsheet.rb

@@ -103,17 +103,17 @@ else # if $have_win32ole
   
 end # if $have_win32ole
 
-  def save(save_path)
+  def save(save_path, chunk_size = 1000, delete_old_gather = false)
   
     # load master taxonomy to validate components
     taxonomy = BCL::MasterTaxonomy.new
     
-    FileUtils.rm_rf(save_path) if File.exists?(save_path) and File.directory?(save_path)
+    #FileUtils.rm_rf(save_path) if File.exists?(save_path) and File.directory?(save_path)
   
     @worksheets.each do |worksheet|
       worksheet.components.each do |component|
         
-        component_xml = Component.new(save_path)
+        component_xml = Component.new("#{save_path}/components")
         component_xml.name = component.name
         component_xml.uid = component.uid
         component_xml.comp_version_id = component.version_id
@@ -202,7 +202,7 @@ end # if $have_win32ole
       
     end
     
-    BCL.gather_components(save_path)
+    BCL.gather_components(save_path,chunk_size,delete_old_gather)
     
   end
   
@@ -278,7 +278,6 @@ end # if $have_win32ole
       if component.uid.nil? or component.uid.empty?
         component.uid = UUID.new.generate
         xlsx_worksheet.Range("B#{i}").value = component.uid     
-        exit
       end
       
       # always write new version id

data/lib/bcl/component_xml.rb

@@ -42,7 +42,17 @@ module BCL
     attr_accessor :source_year
     attr_accessor :source_url
     attr_accessor :objects
-
+    attr_accessor :name  
+    attr_accessor :uid
+    attr_accessor :comp_version_id
+    attr_accessor :description
+    attr_accessor :fidelity_level
+    attr_accessor :source_manufacturer
+    attr_accessor :source_model
+    attr_accessor :source_serial_no
+    attr_accessor :source_year
+    attr_accessor :source_url
+    
     #the save path is where the component will be saved
     def initialize(save_path)
       super(save_path)
@@ -100,8 +110,8 @@ module BCL
       #the directory
 
       Dir.chdir("#{resolve_path}")
-      destination = "#{@name.gsub(" ","_").gsub(".","").gsub("/","_").gsub("-","_").gsub("___","_").gsub("__","_").gsub("in.","in").gsub(",","").strip}.tar.gz"
-
+      destination = "#{@name.gsub(/\W/,'_').gsub(/___/,'_').gsub(/__/,'_').chomp('_').strip}.tar.gz"
+                    
       File.delete(destination) if File.exists?(destination)
 
       BCL.tarball(destination, paths)
@@ -150,21 +160,21 @@ module BCL
 
     def resolve_path
       FileUtils.mkdir_p(@path) unless File.directory?(@path)
-      new_path = "#{@path}/#{name.gsub(" ","_").gsub("/","_").gsub("-","_").gsub("___","_").gsub("__","_").gsub("in.","in").gsub(",","").strip}"
+      new_path = "#{@path}/#{name.gsub(/\W/,'_').gsub(/___/,'_').gsub(/__/,'_').chomp('_').strip}"
       FileUtils.mkdir_p(new_path) unless File.directory?(new_path)
       result = new_path
     end
 
     def osm_resolve_path
       FileUtils.mkdir_p(@path) unless File.directory?(@path)
-      new_path = "#{@path}/osm_#{name.gsub(" ","_").gsub("/","_").gsub("-","_").gsub("___","_").gsub("__","_").gsub("in.","in").gsub(",","").strip}"
+      new_path = "#{@path}/osm_#{name.gsub(/\W/,'_').gsub(/___/,'_').gsub(/__/,'_').chomp('_').strip}"
       FileUtils.mkdir_p(new_path) unless File.directory?(new_path)
       result = new_path
     end
 
     def osc_resolve_path
       FileUtils.mkdir_p(@path) unless File.directory?(@path)
-      new_path = "#{@path}/osc_#{name.gsub(" ","_").gsub("/","_").gsub("-","_").gsub("___","_").gsub("__","_").gsub("in.","in").gsub(",","").strip}"
+      new_path = "#{@path}/osc_#{name.gsub(/\W/,'_').gsub(/___/,'_').gsub(/__/,'_').chomp('_').strip}"
       FileUtils.mkdir_p(new_path) unless File.directory?(new_path)
       result = new_path
     end
@@ -180,7 +190,7 @@ module BCL
 
     def tmp_resolve_path
       FileUtils.mkdir_p(@path) unless File.directory?(@path)
-      new_path = "#{@path}/tmp_#{name.gsub(" ","_").gsub("/","_").gsub("-","_").gsub("___","_").gsub("__","_").gsub("in.","in").gsub(",","").strip}"
+      new_path = "#{@path}/tmp_#{name.gsub(/\W/,'_').gsub(/___/,'_').gsub(/__/,'_').chomp('_').strip}"
       FileUtils.mkdir_p(new_path) unless File.directory?(new_path)
       result = new_path
     end