cloudwalk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a76eb0a4e3788de1be11141163b5f42589b64565
-  data.tar.gz: 492470763d237efd68559c1ffb025269d51ccba4
+  metadata.gz: f6d76b3afb06d902fc1235c9285a78d73c657b30
+  data.tar.gz: 6b50e42b1c3deac0e189e8517c6f13292fb39bd8
 SHA512:
-  metadata.gz: 5ae5747d259dea477e657ece603a9de7be247e034aadb2caeca36246e306e86425c691b82c08d57ae1405436f43aa0355c0c4c4e1aac4e2dc597c35852a4bf2f
-  data.tar.gz: da09203da62f05e97b224b0c9cf7663125bffad6a31b5cf52ff6332403d6d4d6f2e22c34e080a2ae7cf8a0dbc2667dcda0fa8ea619b9f0ca0c78e248895e30b3
+  metadata.gz: 6b4cddbfb08578ceaf1cd7eefec439d696565777c360956409ccf96fb4d1d107c434d7664e057325a1952881eb439df094e0eb6d0001df7443e80ce890197d9c
+  data.tar.gz: 7e5e9c969f4512dfa1d1de9886091ae173292f52d137733a34277f224d8e3298b3c60b2f1322bb88f009f1cd0a11ecc9fbbf78dde58ba5a9536d5ad538faefed

data/lib/cloudwalk/cw_file_json.rb

@@ -86,14 +86,7 @@ module Cloudwalk
           true
         elsif CwFileJson.exists_lock?
           if self.lock = load_cwfile_lock
-            difference = self.compare
-            if difference.empty?
-              true
-            else
-              puts "Warning Cwfile.json and Cwfile.json.lock are different, follow differences:"
-              puts difference
-              false
-            end
+            self.compare
           end
         else
           persist_lock!
@@ -171,6 +164,11 @@ module Cloudwalk
           end
         end
 
+        unless app_lock
+          # TODO Improve!
+          raise Exception.new("application or module #{path} not found in Manager, please create it")
+        end
+
         Cloudwalk::PosxmlVersion.update(
           app_lock["id"], app_lock["version_id"], File.read(path)
         )
@@ -196,23 +194,34 @@ module Cloudwalk
     # TODO future!
 
     def self.compare
-      cwfile_list = self.cwfile["apps"].inject({}) do |hash, app|
-        hash[app["name"]] = app["modules"].inject({}) do |hash_m, app_module|
-          hash_m[app_module[0]] = app_module[1]
-          hash_m
+      cwfile_list = []
+      self.cwfile["apps"].each do |app|
+        cwfile_list << [app["name"], app["version"]]
+        app["modules"].each do |app_module|
+          cwfile_list << [app_module[0], app_module[1]]
         end
-        hash
       end
 
-      lock_list = self.lock.inject({}) do |hash, app|
-        hash[posxml2xml(app["name"])] = app["modules"].inject({}) do |hash_m, app_module|
-          hash_m[posxml2xml(app_module["name"])] = app_module["version"]
-          hash_m
+      lock_list = []
+      self.lock.each do |app|
+        lock_list << [posxml2xml(app["name"]), app["version"]]
+        app["modules"].each do |app_module|
+          lock_list << [posxml2xml(app_module["name"]), posxml2xml(app_module["version"])]
         end
-        hash
       end
 
-      cwfile_list.to_a - lock_list.to_a
+      cwdiff = cwfile_list - lock_list
+      lockdiff = lock_list - cwfile_list
+      unless cwdiff.empty? && lockdiff.empty?
+        puts "Warning Cwfile.json and Cwfile.json.lock are different, follow differences:"
+        puts "Cwfile.json"
+        puts cwdiff.inspect
+        puts "Cwfile.json.lock"
+        puts lockdiff.inspect
+        false
+      else
+        true
+      end
     end
 
     def compare_modules(local_app, module_ids)

data/lib/cloudwalk/rake_task.rb

@@ -64,7 +64,7 @@ module Cloudwalk
               Cloudwalk::CwFileJson.deploy([Cloudwalk::CwFileJson.xml2posxml(out)])
             else
               posxmls = self.outs.collect do |xml|
-                Cloudwalk::CwFileJson.xml2posxml(out)
+                Cloudwalk::CwFileJson.xml2posxml(xml)
               end
               Cloudwalk::CwFileJson.deploy(posxmls)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudwalk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake