cloudwalk 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29ad7565050dda6c992efca2b3bda6ee86aa76f8
-  data.tar.gz: f71cd609728f1f572207f94a08c8a15484b4304e
+  metadata.gz: 6a7426aa8b410bc7e519a77d25818fa6c688fa57
+  data.tar.gz: ad600f23ebb2665d339a0438b0ca7ba4e6afdd12
 SHA512:
-  metadata.gz: e6d104b2386793c2c0085a086c70b21d40dabb83977ea10c6a21bfd20363bebdfc87700137e0735572ff8108c92d33d229702e8f5158d68c2dd55170a95ba824
-  data.tar.gz: 446986bee2e1493b9994afc1b5e66fbd975410e6c7620dc8cf6af625f7299c3c6202560fd8739cd8baf25364bfdd436c72fe94453f2011c599e9980c4bbc8478
+  metadata.gz: 5395cee97c912694bd1105d164bfa36577d5fda4c4c369beb0b0c69f991c5e3865201e32d297400e62aa0d905b856bcd282d3efa36d3d272b0ac0cfdb789153d
+  data.tar.gz: 92fa1ea8a4f71b598fbb4fc481df5446507431f1fd373075faf0dba7c6c062a3a0e75c04fbab89c52e3255242dfeed40a298e92ad585b80003f7677c07989210

data/lib/cloudwalk.rb

@@ -3,8 +3,13 @@ require "net/http"
 require "json"
 require "fileutils"
 
+require_relative "cloudwalk/manager_exception"
+require_relative "cloudwalk/manager_helper"
 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"
+require_relative "cloudwalk/deploy"
+require_relative "cloudwalk/posxml/posxml_application"
+require_relative "cloudwalk/posxml/posxml_version"
+require_relative "cloudwalk/posxml/rake_task"
+require_relative "cloudwalk/ruby/ruby_application"
+require_relative "cloudwalk/ruby/rake_task"

data/lib/cloudwalk/config.rb

@@ -8,7 +8,7 @@ module Cloudwalk
 
     def self.host
       @host ||= `cloudwalk config host`.chomp
-      raise ManagerException.new("Token not found, try 'cloudwalk login'") if @host.empty?
+      raise ManagerException.new("Host not found, try 'cloudwalk login'") if @host.empty?
       @host
     end
   end

data/lib/cloudwalk/cw_file_json.rb

@@ -21,6 +21,8 @@
 
 module Cloudwalk
   class CwFileJson
+    include Cloudwalk::ManagerHelper
+
     CW_FILE_LOCK_PATH = "./Cwfile.json.lock"
     CW_FILE_PATH      = "./Cwfile.json"
 
@@ -105,83 +107,57 @@ module Cloudwalk
     end
 
     def self.lock_build
-      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_local["name"]) }
-        app_posxml = app_remote["posxml_app"]
-        versions   = Cloudwalk::PosxmlVersion.all(app_posxml["id"])
-        version    = versions.find { |json| json["app_version"]["number"] == app_local["version"] }
-
-        if version && version = version["app_version"]
-          version_detail = Cloudwalk::PosxmlVersion.get(app_posxml["id"], version["id"])
-          config << build_application(app_posxml, version, version_detail["app_version"]["module_ids"])
+      if self.ruby?
+        if app = Cloudwalk::Ruby::RubyApplication.find(self.cwfile["name"])
+          config << build_application(:ruby, app)
         else
-          # TODO Version not found, what to do?
+          # 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
         end
       end
+
       self.lock = config
     end
 
     def self.build_module(mod)
-      response = Cloudwalk::PosxmlVersion.get(mod["app_id"], mod["version_id"])
-      module_version = response["app_version"]
-      {
-        "name"       => Cloudwalk::PosxmlApplication.get_name(module_version["app_id"]),
-        "version"    => module_version["number"],
-        "id"         => module_version["app_id"],
-        "version_id" => module_version["id"]
-      }
-    end
-
-    def self.build_application(posxml_app, version_remote, modules_remote)
-      {
-        "name"       => posxml_app["name"],
-        "id"         => posxml_app["id"],
-        "modules"    => modules_remote.collect {|mod| build_module(mod)},
-        "version"    => version_remote["number"],
-        "version_id" => version_remote["id"]
-      }
-
-      #old = config.find {|app| app["id"] == posxml_app["id"]}
-
-      #if old
-        #config.delete(old)
-        #config << new
-      #else
-        #config << new
-      #end
+      if module_version = Cloudwalk::Posxml::PosxmlVersion.get(mod["app_id"], mod["version_id"])
+        {
+          "name"       => Cloudwalk::Posxml::PosxmlApplication.get_name(module_version["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")
+      end
     end
 
-    # TODO Check CRC
-    def self.deploy(outs)
-      outs.each do |path|
-        posxml   = path.split("/").last
-        print "=> Deploying #{posxml}"
-        app_lock = self.lock.find {|config| config["name"] == posxml }
-
-        unless app_lock
-          self.lock.each do |application|
-            app_lock = application["modules"].find {|config| config["name"] == posxml }
-            break if app_lock
-          end
-        end
-
-        unless app_lock
-          # TODO Improve!
-          raise Exception.new("application or module #{path} not found in Manager, please create it")
-        end
-
-        app_cwfile = self.cwfile["apps"].find {|config| config["name"] == posxml2xml(posxml) }
-
-        ret, response = Cloudwalk::PosxmlVersion.update(
-          app_lock["id"], app_lock["version_id"], File.read(path), app_cwfile
-        )
-        if ret
-          STDOUT.write("\r=> Success Deployed                               \n")
-        else
-          STDOUT.write("\r=> Error #{response.code}:#{response.body}\n")
-        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
     end
 
@@ -193,32 +169,45 @@ module Cloudwalk
       File.exists? CW_FILE_LOCK_PATH
     end
 
-    def self.posxml2xml(str)
-      str.sub(".posxml", ".xml")
-    end
-
-    def self.xml2posxml(str)
-      str.sub(".xml", ".posxml")
+    def self.ruby?
+      if self.cwfile
+        self.cwfile["runtime"] == "ruby"
+      end
     end
 
-    # TODO future!
-
-    def self.compare
-      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]]
+    def self.cwfile_apps_and_versions
+      if self.ruby?
+        [self.cwfile["name"], self.cwfile["version"]]
+      else
+        self.cwfile["apps"].inject([]) do |array, app|
+          array << [app["name"], app["version"]]
+          app["modules"].each do |app_module|
+            array << [app_module[0], app_module[1]]
+          end
+          array
         end
       end
+    end
 
-      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"])]
+    def self.lock_apps_and_versions
+      self.lock.inject([]) do |array, app|
+        if self.ruby?
+          array.concat([app["name"], app["version"]])
+        else
+          array << [posxml2xml(app["name"]), app["version"]]
+          app["modules"].each do |app_module|
+            array << [posxml2xml(app_module["name"]), posxml2xml(app_module["version"])]
+          end
+          array
         end
       end
+    end
+
+    # TODO future!
+
+    def self.compare
+      cwfile_list = self.cwfile_apps_and_versions
+      lock_list = self.lock_apps_and_versions
 
       cwdiff = cwfile_list - lock_list
       lockdiff = lock_list - cwfile_list
@@ -233,57 +222,6 @@ module Cloudwalk
         true
       end
     end
-
-    def compare_modules(local_app, module_ids)
-      local_module_app_ids = local_app["modules"].inject([]) do |mods, app|
-        mods << app["id"]
-      end
-
-      module_app_ids = module_ids.inject([]) do |mods, app|
-        mods << app["app_id"]
-      end
-
-      local_creation = local_module_app_ids - module_app_ids
-      remote_creation = module_app_ids - local_module_app_ids
-
-      if local_creation.nil?
-        raise ApplicationConfigError.new("Application #{local_app["name"]}: Local modules are missing #{local_creation}")
-      end
-
-      if remote_creation.nil?
-        raise ApplicationConfigError.new("Application #{local_app["name"]}: Remote modules are missing #{local_creation}")
-      end
-    end
-
-    # curl -X GET "https://api-staging.cloudwalk.io/v1/apps/posxml?access_token=d79db7b1dc59c9c5a1f369478444625a0d1adef8"
-    # curl -X GET "https://manager.cloudwalk.io/v1/apps/posxml/3082/versions?access_token=d79db7b1dc59c9c5a1f369478444625a0d1adef8"
-    def update_apps(list, apps, config)
-      all = Cloudwalk::PosxmlApplication.all
-      list.each do |app, version|
-        local_app = apps.find { |json| json["name"] == app }
-
-        if app[-4..-1] == ".xml" # Check if is posxml application
-          remote_app = all.find { |app_json| app_json["posxml_app"]["name"] == xml2posxml(app) }
-
-          if remote_app
-            remote_posxml_app   = remote_app["posxml_app"]
-            remote_versions     = Cloudwalk::PosxmlVersion.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::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
-              # TODO versions not found, what to do?
-            end
-          else
-            # TODO app not found, what to do?
-          end
-        else
-          # Ruby flow
-        end
-      end
-    end
   end
 end
+

data/lib/cloudwalk/cw_file_json_exception.rb

@@ -0,0 +1,4 @@
+module Cloudwalk
+  class CwFileJsonException < StandardError
+  end
+end

data/lib/cloudwalk/deploy.rb

@@ -0,0 +1,73 @@
+module Cloudwalk
+  class Deploy
+    include Cloudwalk::ManagerHelper
+
+    attr_accessor :cwfile, :lock
+
+    def initialize(cwfile, lock)
+      @cwfile = cwfile
+      @lock   = lock
+    end
+
+    # TODO Check CRC
+    def posxml(outs)
+      outs.each do |path|
+        posxml   = path.split("/").last
+        print "=> Deploying #{posxml}"
+        app_lock = self.lock.find {|config| config["name"] == posxml }
+
+        unless app_lock
+          self.lock.each do |application|
+            app_lock = application["modules"].find {|config| config["name"] == posxml }
+            break if app_lock
+          end
+        end
+
+        unless app_lock
+          # TODO Improve!
+          raise DeployException.new("application or module #{path} not found in Manager, please create it")
+        end
+
+        app_cwfile = self.cwfile["apps"].find {|config| config["name"] == posxml2xml(posxml) }
+
+        ret, response = Cloudwalk::Posxml::PosxmlVersion.update(
+          app_lock["id"], app_lock["version_id"], File.read(path), app_cwfile
+        )
+        if ret
+          STDOUT.write("\r=> Success Deployed                               \n")
+        else
+          STDOUT.write("\r=> Error #{response.code}:#{response.body}\n")
+        end
+      end
+    end
+
+    def name
+      self.cwfile["name"] 
+    end
+
+    def ruby
+      zip = "out/#{self.name}.zip"
+      if File.exists? zip
+        print "=> Deploying #{self.name}"
+
+        app_lock = self.lock.find {|config| config["name"] == self.name }
+
+        unless app_lock
+          # TODO Improve!
+          raise 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
+        )
+        if ret
+          STDOUT.write("\r=> Success Deployed                               \n")
+        else
+          STDOUT.write("\r=> Error #{response.code}:#{response.body}\n")
+        end
+      else
+        raise DeployException.new("application package #{zip} not found")
+      end
+    end
+  end
+end

data/lib/cloudwalk/deploy_exception.rb

@@ -0,0 +1,4 @@
+module Cloudwalk
+  class DeployException < StandardError
+  end
+end

data/lib/cloudwalk/manager_helper.rb

@@ -0,0 +1,24 @@
+module Cloudwalk
+  module ManagerHelper
+    def self.included(base)
+      base.extend(self)
+    end
+
+    def token
+      Cloudwalk::Config.token
+    end
+
+    def host
+      Cloudwalk::Config.host
+    end
+
+    def posxml2xml(str)
+      str.sub(".posxml", ".xml")
+    end
+
+    def xml2posxml(str)
+      str.sub(".xml", ".posxml")
+    end
+  end
+end
+

data/lib/cloudwalk/posxml/posxml_application.rb

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,77 @@
+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/posxml/rake_task.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env rake
+
+require 'rake'
+require 'rake/tasklib'
+require 'fileutils'
+require 'bundler/setup'
+
+# Tasks:
+# cloudwalk:build (Will build mruby or posxml application)
+# cloddwalk:deploy (Send Posxml or Ruby application)
+# cloddwalk:update (Update Cwfile.lock)
+# cloudwalk:package - maybe not
+
+module Cloudwalk
+  module Posxml
+    class RakeTask < ::Rake::TaskLib
+      include Cloudwalk::ManagerHelper
+      include ::Rake::DSL if defined?(::Rake::DSL)
+
+      attr_accessor :libs, :root_path, :main_out, :out_path, :outs
+
+      def initialize
+        yield self if block_given?
+
+        @libs      ||= FileList['lib/*.xml']
+        @root_path ||= "./"
+        @out_path  ||= File.join(root_path, "out", "shared")
+        @outs      ||= @libs.pathmap("%{lib,#{@out_path}}p")
+
+        define
+      end
+
+      def platform_call(command)
+        if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM)
+          sh("bash -c \"#{command}\"")
+        else
+          sh command
+        end
+      end
+
+      def define
+        namespace :cloudwalk do
+          desc "Compile posxml"
+          task :build do |t, args|
+            arguments = ARGV[1..-1]
+            if arguments && path = arguments.first
+              FileUtils.mkdir_p self.out_path
+              xml, out  = self.libs.zip(self.outs).find { |file, out| file == path }
+
+              posxml = xml2posxml(out)
+              platform_call "cloudwalk compile -xml -o #{posxml} #{xml}"
+              puts "=> #{File.size(posxml)} "
+            else
+              FileUtils.rm_rf self.out_path
+              FileUtils.mkdir_p self.out_path
+
+              self.libs.zip(self.outs).each do |file, out|
+                posxml = xml2posxml(out)
+                platform_call "cloudwalk compile -xml -o #{posxml} #{file}"
+                puts "=> #{File.size(posxml)} "
+              end
+            end
+          end
+
+          desc "Deploy all compiled applications based in Cwfile.json"
+          task :deploy => :build do
+            if Cloudwalk::CwFileJson.setup
+              if path = ARGV[1..-1].first
+                xml, out  = self.libs.zip(self.outs).find { |file, out| file == path }
+                posxmls = [xml2posxml(out)]
+              else
+                posxmls = self.outs.collect { |xml| xml2posxml(xml) }
+              end
+              Cloudwalk::Deploy.new(Cloudwalk::CwFileJson.cwfile,
+                                    Cloudwalk::CwFileJson.lock).posxml(posxmls)
+            end
+          end
+
+          desc "Update CwFile.json.lock"
+          task :update do
+            Cloudwalk::CwFileJson.delete_lock!
+            Cloudwalk::CwFileJson.setup(true)
+            Cloudwalk::CwFileJson.persist_lock!
+          end
+        end
+        task :default => "cloudwalk:build"
+      end
+    end
+  end
+end

data/lib/cloudwalk/ruby/rake_task.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/env rake
+
+require 'rake'
+require 'rake/tasklib'
+require 'fileutils'
+require 'bundler/setup'
+
+# Tasks:
+# cloudwalk:build (Will build mruby or posxml application)
+# cloddwalk:deploy (Send Posxml or Ruby application)
+# cloddwalk:update (Update Cwfile.lock)
+# cloudwalk:package - maybe not
+
+module Cloudwalk
+  module Ruby
+    class RakeTask < ::Rake::TaskLib
+      include Cloudwalk::ManagerHelper
+      include ::Rake::DSL if defined?(::Rake::DSL)
+
+      def initialize
+        define
+      end
+
+      def define
+        namespace :cloudwalk do
+          desc "Compile ruby application"
+          task :build do
+            Rake::Task[:build].invoke
+          end
+
+          desc "Package Build"
+          task :package do
+            Rake::Task[:package].invoke
+          end
+
+          desc "Deploy all compiled applications based in Cwfile.json"
+          task :deploy => "cloudwalk:package" do
+            if Cloudwalk::CwFileJson.setup
+              Cloudwalk::Deploy.new(Cloudwalk::CwFileJson.cwfile,
+                                    Cloudwalk::CwFileJson.lock).ruby
+            end
+          end
+
+          desc "Update CwFile.json.lock"
+          task :update do
+            Cloudwalk::CwFileJson.delete_lock!
+            Cloudwalk::CwFileJson.setup(true)
+            Cloudwalk::CwFileJson.persist_lock!
+          end
+        end
+
+        task :default => "cloudwalk:build"
+      end
+    end
+  end
+end
+

data/lib/cloudwalk/ruby/ruby_application.rb

@@ -0,0 +1,71 @@
+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
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudwalk
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,10 +56,16 @@ files:
 - lib/cloudwalk.rb
 - lib/cloudwalk/config.rb
 - lib/cloudwalk/cw_file_json.rb
+- lib/cloudwalk/cw_file_json_exception.rb
+- lib/cloudwalk/deploy.rb
+- lib/cloudwalk/deploy_exception.rb
 - lib/cloudwalk/manager_exception.rb
-- lib/cloudwalk/posxml_application.rb
-- lib/cloudwalk/posxml_version.rb
-- lib/cloudwalk/rake_task.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

data/lib/cloudwalk/posxml_application.rb

@@ -1,44 +0,0 @@
-module Cloudwalk
-  class PosxmlApplication
-    def self.token
-      Cloudwalk::Config.token
-    end
-
-    def self.host
-      Cloudwalk::Config.host
-    end
-
-    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
-

data/lib/cloudwalk/posxml_version.rb

@@ -1,66 +0,0 @@
-module Cloudwalk
-  class PosxmlVersion
-    def self.token
-      Cloudwalk::Config.token
-    end
-
-    def self.host
-      Cloudwalk::Config.host
-    end
-
-    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)))
-      raise ManagerException.new(response["message"]) if response["message"]
-
-      response
-    end
-
-    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
-

data/lib/cloudwalk/rake_task.rb

@@ -1,89 +0,0 @@
-#!/usr/bin/env rake
-
-require 'rake'
-require 'rake/tasklib'
-require 'fileutils'
-require 'bundler/setup'
-
-# Tasks:
-# cloudwalk:build (Will build mruby or posxml application)
-# cloddwalk:deploy (Send Posxml or Ruby application)
-# cloddwalk:update (Update Cwfile.lock)
-# cloudwalk:package - maybe not
-
-module Cloudwalk
-  class RakeTask < ::Rake::TaskLib
-    include ::Rake::DSL if defined?(::Rake::DSL)
-
-    attr_accessor :libs, :root_path, :main_out, :out_path, :outs
-
-    def initialize
-      yield self if block_given?
-
-      @libs      ||= FileList['lib/*.xml']
-      @root_path ||= "./"
-      @out_path  ||= File.join(root_path, "out", "shared")
-      @outs      ||= @libs.pathmap("%{lib,#{@out_path}}p")
-
-      define
-    end
-
-    def platform_call(command)
-      if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM)
-        sh("bash -c \"#{command}\"")
-      else
-        sh command
-      end
-    end
-
-    def define
-      namespace :cloudwalk do
-        desc "Compile posxml"
-        task :build do |t, args|
-          if path = ARGV[1..-1].first
-            FileUtils.mkdir_p self.out_path
-            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}"
-            puts "=> #{File.size(posxml)} "
-          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}"
-              puts "=> #{File.size(posxml)} "
-            end
-          end
-        end
-
-        desc "Deploy all compiled applications based in Cwfile.json"
-        task :deploy => :build do
-          if Cloudwalk::CwFileJson.setup
-            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(xml)
-              end
-              Cloudwalk::CwFileJson.deploy(posxmls)
-            end
-          end
-        end
-
-        desc "Update CwFile.json.lock"
-        task :update do
-          Cloudwalk::CwFileJson.delete_lock!
-          Cloudwalk::CwFileJson.setup(true)
-          Cloudwalk::CwFileJson.persist_lock!
-        end
-
-        task :default => :build
-      end
-    end
-  end
-end
-