aem-deploy 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab22c76d3236da230581e43fe0a2ffd5a0fa6b3
-  data.tar.gz: 70ca68c9afb7889ccc9d65e5a78b1b7957621fee
+  metadata.gz: e24cbb0c947811740e490fef9b1ca92239570334
+  data.tar.gz: 90095fbf276da04e461674c3e54fae59d0080739
 SHA512:
-  metadata.gz: d102bdce92580b57ba324ef46a06e2d9c4ed95a051669f583d5f1f71b6f59526d4ad19d2de46af907eeb1b1d41d88750fe1b268a0c6e41009a08dee1661cd782
-  data.tar.gz: ddcd24ee30d71e6a47c2d4450474004c39fb2459d9ce01d6af97a883acfb95768c026d6ad35f14750e454ae6bd2da89ecc7fa26fe4ea80318208c595b6f9d7e7
+  metadata.gz: 974ca1105f51a9fe3c098bf15e62b3c8627f40867875f334cf7641be732f3ab7e65d914667132585479d3c9a3f82569cdf950714b735d037f158904241bf2319
+  data.tar.gz: 6fd62c8b6478fe5942316248a23b0f6c050bc0547236c655dc5045404d7c14db277d02dc492e57fca43054f1c662427dc204816180cd433e18a8b482aaff1a4b

data/README.md

@@ -1,11 +1,11 @@
 # Aem::Deploy
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/aem/deploy`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Simple Ruby wrapper for the docker compose cli
 
 ## Installation
 
+You need to have the docker compose cli installed. 
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -22,17 +22,29 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Intialize the object (crx host, user, and pass are required )
 
-## Development
+    $ client = Aem::Deploy.new({host: '192.168.0.1', user: 'admin', pass: 'admin'})
+
+Easy Install to CRX (uploads and installs). 
+
+    $ client.install_package('/Users/meaton/Desktop/centre.zip')
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Upload a package to CRX.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+    $ client.upload_package('/Users/meaton/Desktop/centre.zip')
+
+Recompile JSP's
+
+    $ client.recompile_jsps
+
+
+## Development
 
+This project is brand new. I plan to incorporate many other methods here.
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/aem-deploy.
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/docker_compose_ruby.
 
 
 ## License

data/lib/aem-deploy.rb

@@ -4,8 +4,8 @@ require "aem/deploy/session"
 module Aem
   module Deploy
     # Create a new session with teh default options.
-    def self.new(options = {})
-      Session.new(options)
+    def self.new(params = {})
+      Session.new(params)
     end
   end
 end

data/lib/aem/deploy/session.rb

@@ -7,28 +7,47 @@ require 'pry'
 module Aem::Deploy
 
   class Session
-    attr_reader :host, :user, :pass, :retry
+    attr_reader :host, :user, :pass, :retry, :upload_path
 
-    def initialize(options)
-      if [:host, :user, :pass].all? {|k| options.key?(k)}
-        @host = options.fetch(:host)
-        @user = options.fetch(:user)
-        @pass = CGI.escape(options.fetch(:pass))
-        @retry = options.fetch(:retry) unless options[:retry].nil?
+    def initialize(params)
+      if [:host, :user, :pass].all? {|k| params.key?(k)}
+        @host = params.fetch(:host)
+        @user = params.fetch(:user)
+        @pass = CGI.escape(params.fetch(:pass))
+        @retry = params.fetch(:retry) unless params[:retry].nil?
       else
         raise 'Hostname, User and Password are required'
       end
     end
 
-    # Install latest package to CMS
-    def install_package(package_path)
+    #upload and install package
+    def easy_install(package_path)
+      upload_package(package_path)
+      install_package
+    end
+
+    # upload package
+    def upload_package(package_path)
       upload = RestClient.post("http://#{@user}:#{@pass}@#{@host}/crx/packmgr/service/.json", :cmd => 'upload', :package => File.new(package_path, 'rb'), :force => true, :timeout => 300)
       parse_response(upload)
-      upload_path = URI.encode(JSON.parse(upload)["path"])
-      install = RestClient.post("http://#{user}:#{pass}@#{host}/crx/packmgr/service/.json#{upload_path}", :cmd => 'install', :timeout => 300)
+      @upload_path = URI.encode(JSON.parse(upload)["path"])
+    rescue RestClient::RequestTimeout => error
+      {error: error.to_s}.to_json
+      if @retry
+        puts 'retrying installation as there was a problem'
+        retry unless (@retry -= 1).zero?
+      end
+    end
+
+    # Install package
+    def install_package(options = {})
+      if options[:path]
+        @upload_path = options[:path]
+      end
+      install = RestClient.post("http://#{user}:#{pass}@#{host}/crx/packmgr/service/.json#{@upload_path}", :cmd => 'install', :timeout => 300)
       parse_response(install)
     rescue RestClient::RequestTimeout => error
-      {msg: error.to_s}.to_json
+      {error: error.to_s}.to_json
       if @retry
         puts 'retrying installation as there was a problem'
         retry unless (@retry -= 1).zero?
@@ -42,7 +61,7 @@ module Aem::Deploy
       rescue RestClient::Found => error
         return {msg: 'JSPs recompiled'}.to_json
       rescue RestClient::RequestTimeout => error
-        {msg: error.to_s}.to_json
+        {error: error.to_s}.to_json
         if @retry
           puts 'retrying installation as there was a problem'
           retry unless (@retry -= 1).zero?
@@ -54,12 +73,10 @@ module Aem::Deploy
     def parse_response(message)
       if JSON.parse(message)['success'] == true
         return "  #{message}"
-      elsif JSON.parse(message)['msg'].include?("Package already exists")
-        return "  #{message}"
       elsif message.include? ("302 Found")
         return '  JSPs Recompiled'
       else
-        raise "  It looks there was a problem uploading/installing the package #{JSON.parse(message)}"
+        raise "  #{JSON.parse(message)}"
       end
     end
   end

data/lib/aem/deploy/version.rb

@@ -1,5 +1,5 @@
 module Aem
   module Deploy
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aem-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mitch Eaton