cloudwalk 1.14.3 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33fe7832c63301d92899b00ab0470140875c73fd
-  data.tar.gz: 27a31394e1242bd30219e7c1bd211bb4611b7dcd
+SHA256:
+  metadata.gz: 838295a5a7120b68dd5aa8be76e4753fd7d975b53eb596d57a68efa94da993e3
+  data.tar.gz: fede34b4874dde009ba31713a9241483e85557b65accc7e7d5c52a8ebdd64a15
 SHA512:
-  metadata.gz: a372349fb01c4ff26ffe019a1a14405b386e7fcf3e9b8e9974e20ae15474e0b5bac4fc354ce984a3ba02dd27325b5a331168f958568cfb60ecc94e9ebd8eeada
-  data.tar.gz: 85bd15540d1cd124159a75ca287004cc41836687f612735e556d3a61f6515fbefc1cbe358dc74af635e12fb4c352fde5d2cbf37cfbba24df04a8837c6ba54b04
+  metadata.gz: 0403d3c190c1a2cd2e3f16b3ccaf92795311aac6d47c083889fab786df041a2be32bf9df2f3309af755454d043aeafa01a0c70ee80df339a007ba1dadb292bd4
+  data.tar.gz: ce8212697573e8a0c0dc9a1845738f61533b277baa484da58c252ccd46d94894c92b749bb81b101f8c927aa89fa8de2d77395406edb0376cc1f63190695643a0

data/lib/cloudwalk.rb

@@ -9,8 +9,7 @@ require_relative "cloudwalk/config"
 require_relative "cloudwalk/cw_file_json"
 require_relative "cloudwalk/deploy"
 require_relative "cloudwalk/deploy_exception"
-require_relative "cloudwalk/posxml/posxml_application"
-require_relative "cloudwalk/posxml/posxml_version"
+require_relative "cloudwalk/application"
+require_relative "cloudwalk/application_version"
 require_relative "cloudwalk/posxml/rake_task"
-require_relative "cloudwalk/ruby/ruby_application"
 require_relative "cloudwalk/ruby/rake_task"

data/lib/cloudwalk/application.rb

@@ -0,0 +1,68 @@
+module Cloudwalk
+  class Application
+    include Cloudwalk::ManagerHelper
+
+    # NEW
+    def self.find(name)
+      self.all.find do |app|
+        app["name"] == name
+      end
+    end
+
+    def self.all
+      if @apps
+        @apps
+      else
+        response = JSON.parse(Net::HTTP.get(URI("#{self.host}/v1/apps?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["apps"].collect {|r| r["app"] }
+        (total_pages - 1).times do |page|
+          url = "#{self.host}/v1/apps?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"]
+
+          @apps.concat(response["apps"].collect {|r| r["app"] })
+        end
+        @apps
+      end
+    end
+
+    # BASE
+
+    def self.get(id)
+      url = "#{self.host}/v1/apps/#{id}?access_token=#{self.token}"
+      response = JSON.parse(Net::HTTP.get(URI(url)))
+      raise ManagerException.new(response["message"]) if response["message"]
+
+      response["app"]
+    end
+
+    def self.get_name(id)
+      get(id)["name"]
+    end
+
+    def self.update(app_id, bytecode, app_parameters = nil)
+      url      = "#{self.host}/v1/apps/#{app_id}?access_token=#{self.token}"
+      uri      = URI(url)
+      form     = {"bytecode" => Base64.strict_encode64(bytecode)}
+      response = nil
+
+      if app_parameters
+        form["authorizer_url"]    = app_parameters["authorizer_url"]
+        form["description"]       = app_parameters["description"]
+        form["pos_display_label"] = app_parameters["pos_display_label"]
+        form["displayable"]       = app_parameters["pos_display_label"] != "X"
+      end
+
+      Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+        request = Net::HTTP::Put.new(uri)
+        request.set_form_data(form)
+        response = http.request(request)
+      end
+      [response.code.to_i == 200, response]
+    end
+
+  end
+end

data/lib/cloudwalk/application_version.rb

@@ -0,0 +1,74 @@
+module Cloudwalk
+  class ApplicationVersion
+    include Cloudwalk::ManagerHelper
+
+    def self.get_or_create(app, version)
+      response = JSON.parse(Net::HTTP.get(URI("#{self.host}/v1/apps/#{app_id}/versions?access_token=#{self.token}&per_page=100")))
+      raise ManagerException.new(response["message"]) if response["message"]
+
+      #TODO
+      #`curl -X GET "https://api-staging.cloudwalk.io/v1/apps/posxml/3082/versions?access_token=#{self.token}`
+    end
+
+    def self.all(app_id)
+      response = JSON.parse(Net::HTTP.get(URI("#{self.host}/v1/apps/#{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 = "#{self.host}/v1/apps/#{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"]
+
+        versions.concat(response["appversions"])
+      end
+      versions
+    end
+
+    def self.get(app_id, id)
+      url = "#{self.host}/v1/apps/#{app_id}/versions/#{id}?access_token=#{token}"
+      response = JSON.parse(Net::HTTP.get(URI(url)))
+      if response["message"]
+        raise ManagerException.new(response["message"])
+      else
+        response["app_version"]
+      end
+    end
+
+
+    # NEW
+    def self.find(app_name, version_name)
+      applications = Cloudwalk::Application.all
+      application   = applications.find { |app_json| app_json["name"] == xml2posxml(app_name) }
+      versions     = Cloudwalk::ApplicationVersion.all(application["id"])
+      version      = versions.find { |json| json["app_version"]["number"] == version_name }
+
+      [application, (version && version["app_version"])]
+    end
+
+    # NEW B4
+    def self.update(app_id, version_id, bytecode, app_parameters = nil)
+      url    = "#{self.host}/v1/apps/#{app_id}/versions?access_token=#{self.token}"
+      uri      = URI(url)
+      form     = {"bytecode" => Base64.strict_encode64(bytecode)}
+      response = nil
+
+      if app_parameters
+        form["authorizer_url"]    = app_parameters["authorizer_url"]
+        form["number"]            = app_parameters["version"]
+        form["displayable"]       = app_parameters["displayable"]
+        form["pos_display_label"] = app_parameters["pos_display_label"]
+      end
+
+      Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+        request = Net::HTTP::Post.new(uri)
+        request.set_form_data(form)
+        response = http.request(request)
+      end
+      [response.code.to_i == 201, response]
+    end
+  end
+end
+

data/lib/cloudwalk/cw_file_json.rb

@@ -49,6 +49,13 @@ module Cloudwalk
       false
     end
 
+    def self.convert_old_cwfile(cwfile)
+      if cwfile["apps"].nil?
+        cwfile = Hash.[]("apps",[cwfile])
+      end
+      cwfile
+    end
+
     # Load Scenarios
     # 1. Pure true
     # - Cwfile.json exists.
@@ -83,7 +90,7 @@ module Cloudwalk
     # - 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?
     def self.setup(without_lock_check = false)
-      if self.cwfile = load_cwfile
+      if self.cwfile = self.convert_old_cwfile(load_cwfile)
         if without_lock_check
           true
         elsif CwFileJson.exists_lock?
@@ -108,21 +115,17 @@ module Cloudwalk
 
     def self.lock_build
       config = []
-      if self.ruby?
-        if app = Cloudwalk::Ruby::RubyApplication.find(self.cwfile["name"])
-          config << build_application(:ruby, app)
+      self.cwfile["apps"].each do |app_local|
+        app, version = Cloudwalk::ApplicationVersion.find(app_local["name"], app_local["version"])
+        if app && version
+          detail = Cloudwalk::ApplicationVersion.get(app["id"], version["id"])
+          config << build_application(app, version, detail["module_ids"])
+        elsif app
+          app = Cloudwalk::Application.find(xml2posxml(app_local["name"]))
+
+          config << build_application(app, app_local["version"], app_local["modules"])
         else
-          # TODO App not found, what to do?
-        end
-      else
-        self.cwfile["apps"].each do |app_local|
-          app, version = Cloudwalk::Posxml::PosxmlVersion.find(app_local["name"], app_local["version"])
-          if app && version
-            detail = Cloudwalk::Posxml::PosxmlVersion.get(app["id"], version["id"])
-            config << build_application(:posxml, app, version, detail["module_ids"])
-          else
-            raise Cloudwalk::CwFileJsonException.new("App (#{app_local["name"]}) Version (#{app_local["version"]}) not found")
-          end
+          raise Cloudwalk::CwFileJsonException.new("App (#{app_local["name"]}) Version (#{app_local["version"]}) not found")
         end
       end
 
@@ -130,35 +133,26 @@ module Cloudwalk
     end
 
     def self.build_module(mod)
-      if module_version = Cloudwalk::Posxml::PosxmlVersion.get(mod["app_id"], mod["version_id"])
+      app, ver = Cloudwalk::ApplicationVersion.find(mod.first, mod.last)
+      if module_version = Cloudwalk::ApplicationVersion.get(app["id"], ver["id"])
         {
-          "name"       => Cloudwalk::Posxml::PosxmlApplication.get_name(module_version["app_id"]),
+          "name"       => Cloudwalk::Application.get_name(app["id"]),
           "version"    => module_version["number"],
           "id"         => module_version["app_id"],
           "version_id" => module_version["id"]
         }
       else
-        raise Cloudwalk::CwFileJsonException.new("App (#{mod['app_id']}) Module Version (#{mod['version_id']}) not found")
+        raise Cloudwalk::CwFileJsonException.new("App (#{mod.first}) Module Version (#{mod.last}) not found")
       end
     end
 
-    def self.build_application(type, app, version = nil, modules_remote = nil)
-      if type == :ruby
-        {
-          "name"       => app["name"],
-          "id"         => app["id"],
-          "modules"    => [],
-          "version"    => "1.0.0"
-        }
-      else
-        {
-          "name"       => app["name"],
-          "id"         => app["id"],
-          "modules"    => modules_remote.collect {|mod| build_module(mod)},
-          "version"    => version["number"],
-          "version_id" => version["id"]
-        }
-      end
+    def self.build_application(app, version = nil, modules_remote = nil)
+      {
+        "name"       => app["name"],
+        "id"         => app["id"],
+        "modules"    => modules_remote.collect {|mod| build_module(mod)},
+        "version"    => version["number"] || version,
+      }
     end
 
     def self.exists?
@@ -256,11 +250,11 @@ module Cloudwalk
 
           if remote_app
             remote_posxml_app   = remote_app["posxml_app"]
-            remote_versions     = Cloudwalk::Posxml::PosxmlVersion.all(remote_posxml_app["id"])
+            remote_versions     = Cloudwalk::ApplicationVersion.all(remote_posxml_app["id"])
             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 = Cloudwalk::Posxml::PosxmlVersion.get(remote_posxml_app["id"], remote_version["id"])
+              remote_version_detail = Cloudwalk::ApplicationVersion.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/deploy.rb

@@ -30,7 +30,7 @@ module Cloudwalk
 
         app_cwfile = self.cwfile["apps"].find {|config| config["name"] == posxml2xml(posxml) }
 
-        ret, response = Cloudwalk::Posxml::PosxmlVersion.update(
+        ret, response = Cloudwalk::ApplicationVersion.update(
           app_lock["id"], app_lock["version_id"], File.read(path), app_cwfile
         )
         if ret
@@ -42,7 +42,7 @@ module Cloudwalk
     end
 
     def name
-      self.cwfile["name"]
+      self.cwfile["apps"].first["name"]
     end
 
     def ruby
@@ -57,8 +57,8 @@ module Cloudwalk
           raise Cloudwalk::DeployException.new("application #{self.name} not found at Manager, please create it")
         end
 
-        ret, response = Cloudwalk::Ruby::RubyApplication.update(
-          app_lock["id"], File.read(zip), self.cwfile
+        ret, response = Cloudwalk::ApplicationVersion.update(
+          app_lock["id"], app_lock["version_id"], File.read(zip), self.cwfile["apps"].first
         )
         if ret
           STDOUT.write("\r=> Success Deployed                               \n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudwalk
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.15.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,6 +54,8 @@ files:
 - exe/x86_64-pc-linux-gnu
 - exe/x86_64-w64-mingw32.exe
 - lib/cloudwalk.rb
+- lib/cloudwalk/application.rb
+- lib/cloudwalk/application_version.rb
 - lib/cloudwalk/config.rb
 - lib/cloudwalk/cw_file_json.rb
 - lib/cloudwalk/cw_file_json_exception.rb
@@ -61,11 +63,8 @@ files:
 - lib/cloudwalk/deploy_exception.rb
 - lib/cloudwalk/manager_exception.rb
 - lib/cloudwalk/manager_helper.rb
-- lib/cloudwalk/posxml/posxml_application.rb
-- lib/cloudwalk/posxml/posxml_version.rb
 - lib/cloudwalk/posxml/rake_task.rb
 - lib/cloudwalk/ruby/rake_task.rb
-- lib/cloudwalk/ruby/ruby_application.rb
 homepage: https://cloudwalk.io/cli
 licenses:
 - MIT
@@ -85,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: CLI for Cloudwalk projects

data/lib/cloudwalk/posxml/posxml_application.rb

@@ -1,40 +0,0 @@
-module Cloudwalk
-  module Posxml
-    class PosxmlApplication
-      include Cloudwalk::ManagerHelper
-
-      def self.all
-        if @apps
-          @apps
-        else
-          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 = "#{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"]
-
-            apps.concat(response["posxmlapps"])
-          end
-          @apps = apps
-        end
-      end
-
-      def self.get(id)
-        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"]
-
-        response["posxml_app"]
-      end
-
-      def self.get_name(id)
-        get(id)["name"]
-      end
-    end
-  end
-end
-

data/lib/cloudwalk/posxml/posxml_version.rb

@@ -1,77 +0,0 @@
-module Cloudwalk
-  module Posxml
-    class PosxmlVersion
-      include Cloudwalk::ManagerHelper
-
-      def self.get_or_create(app, version)
-        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
-        #`curl -X GET "https://api-staging.cloudwalk.io/v1/apps/posxml/3082/versions?access_token=#{self.token}`
-      end
-
-      def self.all(app_id)
-        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 = "#{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"]
-
-          versions.concat(response["posxmlapps"])
-        end
-        versions
-      end
-
-      def self.get(app_id, id)
-        url = "#{self.host}/v1/apps/posxml/#{app_id}/versions/#{id}?access_token=#{token}"
-        response = JSON.parse(Net::HTTP.get(URI(url)))
-        if response["message"]
-          raise ManagerException.new(response["message"]) 
-        else
-          response["app_version"]
-        end
-      end
-
-
-      # NEW
-      def self.find(app_name, version_name)
-        applications = Cloudwalk::Posxml::PosxmlApplication.all
-        app_remote   = applications.find { |app_json| app_json["posxml_app"]["name"] == xml2posxml(app_name) }
-        app_posxml   = app_remote["posxml_app"]
-        versions     = Cloudwalk::Posxml::PosxmlVersion.all(app_posxml["id"])
-        version      = versions.find { |json| json["app_version"]["number"] == version_name }
-
-        [app_posxml, (version && version["app_version"])]
-      end
-
-      # NEW B4
-      def self.update(app_id, version_id, bytecode, app_parameters = nil)
-        url      = "#{self.host}/v1/apps/posxml/#{app_id}/versions/#{version_id}?access_token=#{self.token}"
-        uri      = URI(url)
-        form     = {"bytecode" => Base64.strict_encode64(bytecode)}
-        response = nil
-
-        if app_parameters
-          form["authorizer_url"]    = app_parameters["authorizer_url"]
-          form["description"]       = app_parameters["description"]
-          form["pos_display_label"] = app_parameters["pos_display_label"]
-          form["displayable"]       = app_parameters["pos_display_label"] != "X"
-        end
-
-        Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-          request = Net::HTTP::Put.new(uri)
-          request.set_form_data(form)
-          response = http.request(request)
-        end
-        [response.code.to_i == 200, response]
-      end
-    end
-  end
-end
-

data/lib/cloudwalk/ruby/ruby_application.rb

@@ -1,70 +0,0 @@
-module Cloudwalk
-  module Ruby
-    class RubyApplication
-      include Cloudwalk::ManagerHelper
-
-      # NEW
-      def self.find(name)
-        self.all.find do |app|
-          app["name"] == name
-        end
-      end
-
-      def self.all
-        if @apps
-          @apps
-        else
-          response = JSON.parse(Net::HTTP.get(URI("#{self.host}/v1/apps/ruby?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["rubyapps"].collect {|r| r["ruby_app"] }
-          (total_pages - 1).times do |page|
-            url = "#{self.host}/v1/apps/ruby?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"]
-
-            @apps.concat(response["ruby_app"])
-          end
-          @apps
-        end
-      end
-
-      # BASE
-
-      def self.get(id)
-        url = "#{self.host}/v1/apps/ruby/#{id}?access_token=#{self.token}"
-        response = JSON.parse(Net::HTTP.get(URI(url)))
-        raise ManagerException.new(response["message"]) if response["message"]
-
-        response["ruby_app"]
-      end
-
-      def self.get_name(id)
-        get(id)["name"]
-      end
-
-      def self.update(app_id, bytecode, app_parameters = nil)
-        url      = "#{self.host}/v1/apps/ruby/#{app_id}?access_token=#{self.token}"
-        uri      = URI(url)
-        form     = {"bytecode" => Base64.strict_encode64(bytecode)}
-        response = nil
-
-        if app_parameters
-          form["authorizer_url"]    = app_parameters["authorizer_url"]
-          form["description"]       = app_parameters["description"]
-          form["pos_display_label"] = app_parameters["pos_display_label"]
-          form["displayable"]       = app_parameters["pos_display_label"] != "X"
-        end
-
-        Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-          request = Net::HTTP::Put.new(uri)
-          request.set_form_data(form)
-          response = http.request(request)
-        end
-        [response.code.to_i == 200, response]
-      end
-    end
-  end
-end
-