occi-cli 4.0.0.beta.1 → 4.0.0.beta.2

data/lib/occi/cli/helpers.rb

@@ -90,7 +90,9 @@ module Occi::Cli
           Occi::Log.debug "with links: #{options.links}"
 
           options.links.each do |link|
-            link = options.endpoint.chomp('/') + link unless link.start_with? options.endpoint
+            if link.start_with? options.endpoint
+              link.gsub!(options.endpoint.chomp('/'), '')
+            end
 
             if link.include? "/storage/"
               Occi::Log.debug "Adding storagelink to #{options.resource}"
@@ -155,8 +157,10 @@ module Occi::Cli
           end
         end
 
-        #TODO: set other attributes
+        # TODO: set other attributes
+        # TODO: OCCI-OS uses occi.compute.hostname instead of title
         res.title = options.attributes[:title]
+        res.hostname = options.attributes[:title]
 
         Occi::Log.debug "Creating #{options.resource}:\n#{res.inspect}"
 

data/lib/occi/cli/occi_opts.rb

@@ -163,6 +163,10 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
                 "--resource RESOURCE",
                 String,
                 "Resource to be queried (e.g. network, compute, storage etc.), required") do |resource|
+          # TODO: find a way to remove this OCCI-OS compatibility hack
+          resource = 'os_tpl' if resource == 'os'
+          resource = 'resource_tpl' if resource == 'resource'
+
           options.resource = resource
         end
 
@@ -199,7 +203,7 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
               end
 
               if symbol == :user_data
-                context_data = Base64.encode64(context_data)
+                context_data = Base64.encode64(context_data).gsub("\n", '')
               end
 
               options.context_vars[symbol] = context_data.strip

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.0.0.beta.1" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.0.0.beta.2" unless defined?(::Occi::Cli::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.1
+  version: 4.0.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api