aem-deploy 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db0c00645694b1c63d5a1a9ebcc601693902ca1
-  data.tar.gz: 2f4b681572c95156d4aee401ad9884d329b78ff4
+  metadata.gz: 1ab22c76d3236da230581e43fe0a2ffd5a0fa6b3
+  data.tar.gz: 70ca68c9afb7889ccc9d65e5a78b1b7957621fee
 SHA512:
-  metadata.gz: f1bee69599c757fee1e6615c3cc6c275e2fc1032afdf6b6478020b4ba41296c891f3b7de4072926b1ace65745f50fc95a725628b6a7c93ccb3778a2dc515e01f
-  data.tar.gz: 75cb4139630cf28410a914615b21bd6a3b35b4814f44a273dc6203c3a2662478b2b8de8bb06f22f06f6b8fa6f1734cfbd1794f3273ef2d1d0617c3da7dc7e0a5
+  metadata.gz: d102bdce92580b57ba324ef46a06e2d9c4ed95a051669f583d5f1f71b6f59526d4ad19d2de46af907eeb1b1d41d88750fe1b268a0c6e41009a08dee1661cd782
+  data.tar.gz: ddcd24ee30d71e6a47c2d4450474004c39fb2459d9ce01d6af97a883acfb95768c026d6ad35f14750e454ae6bd2da89ecc7fa26fe4ea80318208c595b6f9d7e7

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gem 'pry-nav', '~> 0.2.4'
 gem 'rest-client'
-gemspec
+gemspec :name => 'aem-deploy'

data/aem-deploy.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   # delete this section to allow pushing this gem to any host.
   
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = ["lib/aem-deploy.rb",`git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

data/lib/aem-deploy.rb

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

data/lib/aem/deploy.rb

@@ -1,11 +1 @@
-require "aem/deploy/version"
-require "aem/deploy/session"
-
-module Aem
-  module Deploy
-    # Create a new session with teh default options.
-    def self.new
-      Session.new
-    end
-  end
-end
+require File.dirname(__FILE__) + '/aem'

data/lib/aem/deploy/session.rb

@@ -2,62 +2,64 @@ require 'rest_client'
 require 'open-uri'
 require 'uri'
 require 'cgi'
-require 'yaml'
-require 'rake'
-require 'erb'
 require 'json'
-
+require 'pry'
 module Aem::Deploy
 
-
   class Session
     attr_reader :host, :user, :pass, :retry
 
-    def initialize(host,user,pass, options = {})
-      @host = host
-      @user = user
-      @password = CGI.escape(pass)
-      @retry ||= options[:retry]
+    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?
+      else
+        raise 'Hostname, User and Password are required'
+      end
     end
 
     # Install latest package to CMS
     def install_package(package_path)
-      binding.pry
-      upload = RestClient.post("http://#{@user}:#{@pass}@#{@host}/crx/packmgr/service/.json", :cmd => 'upload', :package => File.new(package_path, 'rb'), :timeout => 300)
+      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 = JSON.parse(upload)["path"]
+      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)
       parse_response(install)
     rescue RestClient::RequestTimeout => error
-      if @tries?
-        retry unless (@tries -= 1).zero?
+      {msg: error.to_s}.to_json
+      if @retry
+        puts 'retrying installation as there was a problem'
+        retry unless (@retry -= 1).zero?
       end
-      return {msg: error.to_s}.to_json
     end
 
     # Recompiles JSPs on CMS
-    def recompile_jsps(host,user,pass)
+    def recompile_jsps
       begin
-        RestClient.post "http://#{user}:#{encoded_pass}@#{host}/system/console/slingjsp", :cmd => 'recompile', :timeout => 120
+        RestClient.post "http://#{@user}:#{@pass}@#{@host}/system/console/slingjsp", :cmd => 'recompile', :timeout => 120
       rescue RestClient::Found => error
-        return {msg: error.to_s}.to_json
+        return {msg: 'JSPs recompiled'}.to_json
       rescue RestClient::RequestTimeout => error
-        puts 'We had to retry recompiling JSPs. Might want to check it out'
-        retry unless (tries -= 1).zero?
-        return {msg: error.to_s}.to_json
+        {msg: error.to_s}.to_json
+        if @retry
+          puts 'retrying installation as there was a problem'
+          retry unless (@retry -= 1).zero?
+        end
       end
     end
 
     # Checks response of any request to CMS. Breaks script if unexpected response.
     def parse_response(message)
       if JSON.parse(message)['success'] == true
-        puts "  #{message}"
+        return "  #{message}"
       elsif JSON.parse(message)['msg'].include?("Package already exists")
-        puts "  #{message}"
+        return "  #{message}"
       elsif message.include? ("302 Found")
-        puts '  JSPs Recompiled'
+        return '  JSPs Recompiled'
       else
-        puts "  Something is wroning the script with response of #{JSON.parse(message)}"
+        raise "  It looks there was a problem uploading/installing the package #{JSON.parse(message)}"
       end
     end
   end

data/lib/aem/deploy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aem-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Mitch Eaton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -53,6 +54,9 @@ files:
 - aem-deploy.gemspec
 - bin/console
 - bin/setup
+- lib/.DS_Store
+- lib/aem-deploy.rb
+- lib/aem/.DS_Store
 - lib/aem/deploy.rb
 - lib/aem/deploy/session.rb
 - lib/aem/deploy/version.rb
@@ -76,9 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to wrap deployments to Adobe Experience Manager
 test_files: []
-has_rdoc: