lapis_lazuli 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c231db7a9cb304150e2ca2eccf956be02c367482
-  data.tar.gz: 3eb2d929510b34cfd70f2e944eb2590b6059f6e6
+  metadata.gz: ed6ca8f1aa232bdc2014087496286902cae4f061
+  data.tar.gz: 8a9b24b75b4e148bd4b84531174c199ff76004e4
 SHA512:
-  metadata.gz: cede96cad3beb40c9a3f331c47cc930906ccd707283b393aaddccd4d713120233b3e01c4b3d7f15dbf1f117fde4b1c9d3593f1ae43d8189b2d6316345d2e4b16
-  data.tar.gz: d941873ef4a11ef98524f994c931b0acea5348dc261b6392dddabdff7212b1d678b91a311b18fbe1d21cd58c986100e386e88de270299093e6b0c580b28a9915
+  metadata.gz: 8d35e57fbe11bb803d15019b5e564aa96bdd5b9b6c27ab98364419475747b818777120cf3551aec7dbbccf0413fa09fd32ead27d915cea89f662f22828871b05
+  data.tar.gz: e1f684eb9fec6bc62e9a04e6e301d6c1f4949d931adf1e7cc799d77ae841aec8ae34779fd5278f0894a1cebef91e7b86a04d49d8a445edb15bbcb1be7199454a

data/lib/lapis_lazuli/runtime.rb

@@ -19,6 +19,12 @@ module LapisLazuli
       @objects = {}
     end
 
+    ##
+    # Number of objects stored in the Runtime
+    def length
+      return @objects.keys.length
+    end
+
     def has?(name)
       return @objects.has_key? name
     end
@@ -49,6 +55,12 @@ module LapisLazuli
       return obj
     end
 
+    ##
+    # Remove an object from the Runtime
+    def unset(name)
+      @objects.delete(name)
+    end
+
     def get(name)
       return @objects[name]
     end
@@ -57,6 +69,22 @@ module LapisLazuli
   private
     def self.destroy(world, name, destructor)
       Proc.new do
+        # Try to run destroy on the object itself
+        obj = Runtime.instance.get(name)
+
+        #world.log.debug("Destroying #{name}")
+
+        # Do not destroy the logger until everything else has been stopped
+        if name == :logger and Runtime.instance.length > 1
+          #world.log.debug("This is the logger, wait until everything is closed")
+          break
+        end
+        Runtime.instance.unset(name)
+
+        if obj.respond_to?(:destroy)
+          obj.send(:destroy, world)
+          break
+        end
         # If a destructor is given, call that.
         if not destructor.nil?
           return destructor.call(world)
@@ -76,12 +104,6 @@ module LapisLazuli
           return world.send(name).destroy(world)
         end
 
-        # Try to run destroy on the object itself
-        obj = Runtime.get(name)
-        if obj.respond_to? :destroy
-          return obj.send(:destroy)
-        end
-
         # If the object has stream/socket functions close ends the connection
         if obj.respond_to? :close
           return obj.send(:close)

data/lib/lapis_lazuli/storage.rb

@@ -9,8 +9,14 @@ module LapisLazuli
   ##
   # Simple storage class
   class Storage
+    # The name of this storage container
+    @name
     @data
-    def initialize
+
+    ##
+    # Initialize the storage with an optional name
+    def initialize(name=nil)
+      @name = name
       @data = {}
     end
 
@@ -28,7 +34,13 @@ module LapisLazuli
 
     ##
     # Write all stored data to file
-    def writeToFile(filename)
+    def writeToFile(filename=nil)
+      if filename.nil? && @name.nil?
+        raise "Need a filename"
+      elsif filename.nil?
+        filename = "#{@name}.json"
+      end
+
       # Make storage directory
       dir = File.dirname(filename)
       begin
@@ -41,17 +53,47 @@ module LapisLazuli
 
       File.open(filename, 'w') { |file|
         # Write the JSON to the file
-        file.write(@data.to_json)
+        file.puts(@data.to_json)
       }
     end
 
     ##
     # This will be called during the destruction of the world
     def destroy(world)
-      filename = world.config("storage_dir", ".#{File::SEPARATOR}storage") +
-        File::SEPARATOR +
-        world.time[:timestamp] +
-        ".json"
+      # No data to write
+      if @data.keys.length == 0
+        world.log.debug("Storage '#{@name}' is empty")
+        return
+      end
+
+      filename = nil
+
+      # If we have a name
+      if !@name.nil?
+        # Check the environment for a filename
+        env_value = world.env("#{@name}_file", nil)
+        if !env_value.nil?
+          filename = env_value
+        end
+      end
+      # Otherwise, generate a name
+      if filename.nil?
+        # Folder to store in
+        filename += world.config("storage_dir", ".#{File::SEPARATOR}storage") + File::SEPARATOR
+
+        # Filename
+        if @name.nil?
+          # Use current timestamp and the object_id of the data
+          filename += world.time[:timestamp] + "_" + @data.object_id
+        else
+          # Use the given name
+          filename += @name
+        end
+
+        # JSON file extension
+        filename += ".json"
+      end
+
       world.log.debug("Writing storage to: #{filename}")
       self.writeToFile(filename)
     end

data/lib/lapis_lazuli/version.rb

@@ -6,5 +6,5 @@
 # All rights reserved.
 #
 module LapisLazuli
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/lapis_lazuli/world/browser.rb

@@ -51,9 +51,29 @@ module WorldModule
       b = Runtime.instance.set_if(self, :browser) do
         # Add LL to the arguments for the browser
         LapisLazuli::Browser.set_world(self)
-        
+
         # Create & return a new browser object
-        LapisLazuli::Browser.new(*args)
+        brow = LapisLazuli::Browser.new(*args)
+
+        metadata = Runtime.instance.get(:metadata)
+        if metadata
+          metadata.set(
+            "browser",
+            {
+              "name" => brow.driver.capabilities[:browser_name],
+              "version" => brow.driver.capabilities[:version],
+              "platform" => brow.driver.capabilities[:platform],
+            }
+          )
+        end
+
+        sessionid = brow.driver.capabilities["webdriver.remote.sessionid"]
+
+        if !sessionid.nil?
+          metadata.set("sessionid", sessionid)
+        end
+
+        brow
       end
 
       if not b.is_open?

data/lib/lapis_lazuli/world/config.rb

@@ -7,6 +7,8 @@
 #
 
 require "lapis_lazuli/options"
+require "lapis_lazuli/storage"
+require "lapis_lazuli/runtime"
 
 module LapisLazuli
 module WorldModule
@@ -52,6 +54,18 @@ module WorldModule
         warn "Could not load configuration from: #{Config.config_file}"
         @config = {}
       end
+
+      @metadata = Runtime.instance.set_if(self, :metadata) do
+        log.debug "Creating metadata storage"
+        Storage.new("metadata")
+      end
+    end
+
+    def metadata
+      if @metadata.nil?
+        raise "No metadata available"
+      end
+      return @metadata
     end
 
 
@@ -179,7 +193,7 @@ module WorldModule
     # ll.config("test.google.url") => "www.google.com"
     #
     # Raises error if traversing the object is impossible
-    def config(variable=false, default=nil)
+    def config(variable=false, default=(no_default_set=true;nil))
       # Make sure the configured configuration is loaded, if possible
       init
 
@@ -199,7 +213,7 @@ module WorldModule
 
       # Otherwise try to find it in the configuration object
       variable.split(".").each do |part|
-        if default.nil? and result.nil?
+        if no_default_set == true && result.nil?
           raise "Unknown configuration variable '#{variable}' and no default given!"
         end
         break if result.nil?
@@ -214,7 +228,7 @@ module WorldModule
       if default.nil? and result.nil?
         if CONFIG_OPTIONS.has_key? variable
           return CONFIG_OPTIONS[variable][0]
-        else
+        elsif no_default_set == true
           raise "Unknown configuration variable '#{variable}' and no default given!"
         end
       else
@@ -306,7 +320,6 @@ module WorldModule
       # Variables like:
       #  var_from_env("remote.url","http://test.test")
       if var.is_a? String and
-          var.include? "." and
           not default.is_a? Hash
 
         # Env variables cannot contain a . replace them by _
@@ -377,7 +390,6 @@ module WorldModule
 
       return value
     end
-
   end # module Config
 end # module WorldModule
 end # module LapisLazuli

data/lib/lapis_lazuli/world/error.rb

@@ -86,7 +86,7 @@ module WorldModule
 
       # Include URL if we have a browser
       if self.has_browser?
-        message += " (#{self.browser.url})"
+        message += " [ #{self.browser.url} ]"
       end
 
       # Add the groups to the message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapis_lazuli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Onno Steenbergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler