cloudwalk 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fa03d69bf8f3d0d59c5c199e4fc18795eb1a0f
-  data.tar.gz: 9251eb4d60a9e7cff81da98eedf7f69049ce76f0
+  metadata.gz: a76eb0a4e3788de1be11141163b5f42589b64565
+  data.tar.gz: 492470763d237efd68559c1ffb025269d51ccba4
 SHA512:
-  metadata.gz: 701c4cc10a5857668aec621afd2548ba4fdef30cebddab6e835b3314c98c30d45d08da9c8c2c10dc1194cd8295b944b1d62c1924bd710e37fcdd11d971ce0f05
-  data.tar.gz: d0665b30ac7ca6ed7bca08eded16145b32323f1fc29e78ee4553b0d88d1cf300897795eef8ebbc55286a8e0e0586bc2433b5b1dc7cd4e0b2188b8eaa9a4e66cc
+  metadata.gz: 5ae5747d259dea477e657ece603a9de7be247e034aadb2caeca36246e306e86425c691b82c08d57ae1405436f43aa0355c0c4c4e1aac4e2dc597c35852a4bf2f
+  data.tar.gz: da09203da62f05e97b224b0c9cf7663125bffad6a31b5cf52ff6332403d6d4d6f2e22c34e080a2ae7cf8a0dbc2667dcda0fa8ea619b9f0ca0c78e248895e30b3

data/lib/cloudwalk.rb

@@ -3,6 +3,8 @@ require "net/http"
 require "json"
 require "fileutils"
 
+require_relative "cloudwalk/config"
+require_relative "cloudwalk/cw_file_json"
 require_relative "cloudwalk/posxml_application"
 require_relative "cloudwalk/posxml_version"
 require_relative "cloudwalk/rake_task"

data/lib/cloudwalk/cw_file_json.rb

@@ -24,7 +24,9 @@ module Cloudwalk
     CW_FILE_LOCK_PATH = "./Cwfile.json.lock"
     CW_FILE_PATH      = "./Cwfile.json"
 
-    attr_accessor :cwfile, :lock
+    class << self
+      attr_accessor :cwfile, :lock
+    end
 
     def self.load_cwfile_lock
       JSON.parse(File.read(CW_FILE_LOCK_PATH))
@@ -52,7 +54,7 @@ module Cloudwalk
     # - json and lock are the same
     # R: Just execute :)
     #
-    # 2. 
+    # 2.
     # - Cwfile.json exists.
     # - Cwfile.json.lock exists.
     # - json and lock aren't the same
@@ -67,14 +69,14 @@ module Cloudwalk
     # Scenarios:
     #  - The user could create a version on manager and just updated Cwfile.json, instead of delete Cwfile.json.lock
     #    - Maybe create an update action, rake cloudwalk:update
-    #  - The user 
+    #  - The user
     #
-    # 3. 
+    # 3.
     # - Cwfile.json exists.
     # - Cwfile.json.lock not exists.
     # R: Create Cwfile.json.lock
     #
-    # 4. 
+    # 4.
     # - Cwfile.json not exists.
     # - Cwfile.json.lock not exists.
     # R: ASK: Cwfile.json not exists, should I create a skeleton or get the last versions available for the files we have here?
@@ -111,13 +113,13 @@ module Cloudwalk
       all = Cloudwalk::PosxmlApplication.all
       config = []
       self.cwfile["apps"].each do |app_local|
-        app_remote = all.find { |app_json| app_json["posxml_app"]["name"] == xml2posxml(app) }
+        app_remote = all.find { |app_json| app_json["posxml_app"]["name"] == xml2posxml(app_local["name"]) }
         app_posxml = app_remote["posxml_app"]
         versions   = Cloudwalk::PosxmlVersion.all(app_posxml["id"])
-        version    = versions.find { |json| json["app_version"]["number"] == version }
+        version    = versions.find { |json| json["app_version"]["number"] == app_local["version"] }
 
         if version && version = version["app_version"]
-          version_detail = PosxmlApplication::Version.get(app_posxml["id"], version["id"])
+          version_detail = Cloudwalk::PosxmlVersion.get(app_posxml["id"], version["id"])
           config << build_application(app_posxml, version, version_detail["app_version"]["module_ids"])
         else
           # TODO Version not found, what to do?
@@ -127,10 +129,10 @@ module Cloudwalk
     end
 
     def self.build_module(mod)
-      response = PosxmlApplication::Version.get(mod["app_id"], mod["version_id"])
+      response = Cloudwalk::PosxmlVersion.get(mod["app_id"], mod["version_id"])
       module_version = response["app_version"]
       {
-        "name"       => PosxmlApplication::Apps.get_name(module_version["app_id"]),
+        "name"       => Cloudwalk::PosxmlApplication.get_name(module_version["app_id"]),
         "version"    => module_version["number"],
         "id"         => module_version["app_id"],
         "version_id" => module_version["id"]
@@ -159,10 +161,7 @@ module Cloudwalk
     # TODO Check CRC
     def self.deploy(outs)
       outs.each do |path|
-        p path
-        posxml = path.split("/").last
-        #app    = posxml2xml(posxml)
-
+        posxml   = path.split("/").last
         app_lock = self.lock.find {|config| config["name"] == posxml }
 
         unless app_lock
@@ -197,7 +196,7 @@ module Cloudwalk
     # TODO future!
 
     def self.compare
-      cwfile_list = self.cwfile.inject({}) do |hash, app|
+      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
@@ -253,7 +252,7 @@ module Cloudwalk
             remote_version_json = remote_versions.find { |json| json["app_version"]["number"] == version }
 
             if remote_version_json && (remote_version = remote_version_json["app_version"])
-              remote_version_detail = PosxmlApplication::Version.get(remote_posxml_app["id"], remote_version["id"])
+              remote_version_detail = Cloudwalk::PosxmlVersion.get(remote_posxml_app["id"], remote_version["id"])
               # TODO: Check if application exists locally
               build_application(local_app, config, remote_posxml_app, remote_version, remote_version_detail["app_version"]["module_ids"])
             else

data/lib/cloudwalk/posxml_application.rb

@@ -12,13 +12,13 @@ module Cloudwalk
       if @apps
         @apps
       else
-        response = JSON.parse(Net::HTTP.get(URI("https://#{self.host}/v1/apps/posxml?access_token=#{self.token}&per_page=100")))
+        response = JSON.parse(Net::HTTP.get(URI("#{self.host}/v1/apps/posxml?access_token=#{self.token}&per_page=100")))
         raise ManagerException.new(response["message"]) if response["message"]
 
         total_pages = response["pagination"]["total_pages"].to_i
         apps = response["posxmlapps"]
         (total_pages - 1).times do |page|
-          url = "https://#{self.host}/v1/apps/posxml?access_token=#{self.token}&per_page=100&page=#{page+2}"
+          url = "#{self.host}/v1/apps/posxml?access_token=#{self.token}&per_page=100&page=#{page+2}"
           response = JSON.parse(Net::HTTP.get(URI(url)))
           raise ManagerException.new(response["message"]) if response["message"]
 
@@ -29,7 +29,7 @@ module Cloudwalk
     end
 
     def self.get(id)
-      url = "https://#{self.host}/v1/apps/posxml/#{id}?access_token=#{self.token}"
+      url = "#{self.host}/v1/apps/posxml/#{id}?access_token=#{self.token}"
       response = JSON.parse(Net::HTTP.get(URI(url)))
       raise ManagerException.new(response["message"]) if response["message"]
 

data/lib/cloudwalk/posxml_version.rb

@@ -9,7 +9,7 @@ module Cloudwalk
     end
 
     def self.get_or_create(app, version)
-      response = JSON.parse(Net::HTTP.get(URI("https://#{self.host}/v1/apps/posxml/#{app_id}/versions?access_token=#{self.token}&per_page=100")))
+      response = JSON.parse(Net::HTTP.get(URI("#{self.host}/v1/apps/posxml/#{app_id}/versions?access_token=#{self.token}&per_page=100")))
       raise ManagerException.new(response["message"]) if response["message"]
 
       #TODO
@@ -17,14 +17,14 @@ module Cloudwalk
     end
 
     def self.all(app_id)
-      response = JSON.parse(Net::HTTP.get(URI("https://#{self.host}/v1/apps/posxml/#{app_id}/versions?access_token=#{self.token}&per_page=100")))
+      response = JSON.parse(Net::HTTP.get(URI("#{self.host}/v1/apps/posxml/#{app_id}/versions?access_token=#{self.token}&per_page=100")))
       raise ManagerException.new(response["message"]) if response["message"]
 
       total_pages = response["pagination"]["total_pages"].to_i
       versions = response["appversions"]
 
       (total_pages - 1).times do |page|
-        url = "https://#{self.host}/v1/apps/posxml/#{app_id}/versions?access_token=#{self.token}&per_page=100&page=#{page+2}"
+        url = "#{self.host}/v1/apps/posxml/#{app_id}/versions?access_token=#{self.token}&per_page=100&page=#{page+2}"
         response = JSON.parse(Net::HTTP.get(URI(url)))
         raise ManagerException.new(response["message"]) if response["message"]
 
@@ -34,7 +34,7 @@ module Cloudwalk
     end
 
     def self.get(app_id, id)
-      url = "https://#{self.host}/v1/apps/posxml/#{app_id}/versions/#{id}?access_token=#{token}"
+      url = "#{self.host}/v1/apps/posxml/#{app_id}/versions/#{id}?access_token=#{token}"
       response = JSON.parse(Net::HTTP.get(URI(url)))
       raise ManagerException.new(response["message"]) if response["message"]
 
@@ -44,13 +44,14 @@ module Cloudwalk
     def self.update(app_id, version_id, bytecode)
       url = "#{self.host}/v1/apps/posxml/#{app_id}/versions/#{version_id}?access_token=#{self.token}"
       uri = URI(url)
-      uri.encode_www_form({"bytecode" => Base64.strict_encode64(bytecode)})
+      response = nil
 
       Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
         request = Net::HTTP::Put.new(uri)
-        response = http.request request
+        request.set_form_data({"bytecode" => Base64.strict_encode64(bytecode)})
+        response = http.request(request)
       end
-      p response
+      response.code == 200
     end
   end
 end

data/lib/cloudwalk/rake_task.rb

@@ -15,7 +15,7 @@ module Cloudwalk
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    attr_accessor :libs, :root_path, :main_out, :out_path
+    attr_accessor :libs, :root_path, :main_out, :out_path, :outs
 
     def initialize
       yield self if block_given?
@@ -39,20 +39,35 @@ module Cloudwalk
     def define
       namespace :cloudwalk do
         desc "Compile posxml"
-        task :build do
-          FileUtils.rm_rf self.out_path
-          FileUtils.mkdir_p self.out_path
-          self.libs.zip(self.outs).each do |file, out|
-            posxml = CwFileJson.xml2posxml(out)
-            puts "cloudwalk compile -xml -o #{posxml} #{file}"
-            platform_call "cloudwalk compile -xml -o #{posxml} #{file}"
+        task :build do |t, args|
+          if path = ARGV[1..-1].first
+            xml, out  = self.libs.zip(self.outs).find { |file, out| file == path }
+
+            posxml = Cloudwalk::CwFileJson.xml2posxml(out)
+            platform_call "cloudwalk compile -xml -o #{posxml} #{xml}"
+          else
+            FileUtils.rm_rf self.out_path
+            FileUtils.mkdir_p self.out_path
+
+            self.libs.zip(self.outs).each do |file, out|
+              posxml = Cloudwalk::CwFileJson.xml2posxml(out)
+              platform_call "cloudwalk compile -xml -o #{posxml} #{file}"
+            end
           end
         end
 
         desc "Deploy all compiled applications based in Cwfile.json"
         task :deploy => :build do
           if Cloudwalk::CwFileJson.setup
-            Cloudwalk::CwFileJson.deploy(self.outs)
+            if path = ARGV[1..-1].first
+              xml, out  = self.libs.zip(self.outs).find { |file, out| file == path }
+              Cloudwalk::CwFileJson.deploy([Cloudwalk::CwFileJson.xml2posxml(out)])
+            else
+              posxmls = self.outs.collect do |xml|
+                Cloudwalk::CwFileJson.xml2posxml(out)
+              end
+              Cloudwalk::CwFileJson.deploy(posxmls)
+            end
           end
         end
 

metadata

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