Merge pull request pierre#5 from stevenschlansker/version-without-art…

…ifact-name

Version without artifact name

lib/galaxy/agent_remote_api.rb

@@ -16,11 +16,12 @@ def become! req_build_version, requested_config_path, config_uri=nil, binaries_u
             raise error_reason
           end
         end
+
+        prop_builder = Galaxy::Properties::Builder.new config_uri.nil? ? @repository_base : config_uri, @http_user, @http_password, @logger
 
-        build_version = Galaxy::BuildVersion.new_from_options req_build_version
+        build_version = Galaxy::BuildVersion.new_from_options req_build_version, prop_builder, requested_config
 
         if build_version.nil?
-          prop_builder = Galaxy::Properties::Builder.new config_uri.nil? ? @repository_base : config_uri, @http_user, @http_password, @logger
           build_version = Galaxy::BuildProperties.new_from_config(@logger, prop_builder, requested_config)
           build_version.validate_os(@os)
         end

lib/galaxy/properties.rb

@@ -54,7 +54,7 @@ def build hierarchy, file_name
           end
           history
         end
-        @log.debug props.inspect
+        @log.debug "Built properties are #{props.inspect}"
         props
       end
 

lib/galaxy/software.rb

@@ -96,11 +96,20 @@ def initialize group, artifact, version
       @version = version
     end
 
-    def self.new_from_options build_version
+    def self.new_from_options build_version, prop_builder = nil, config = nil
+      if !prop_builder.nil?
+        build_properties = prop_builder.build(config.config_path, "build.properties")
+
+        group = build_properties['group']
+        artifact = build_properties['type'] || build_properties['artifact']
+        version = build_properties['build'] || build_properties['version']
+      end
+
       if !build_version.nil?
         elements = build_version.split ':'
-        if elements.size == 2
-          group = nil
+        if elements.size == 1
+          version = elements[0]
+        elsif elements.size == 2
           artifact = elements[0]
           version = elements[1]
         elsif elements.size == 3