adobe-aem-api 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Mzc4NzY1OGQyYjRiYzJmMDRiZjIyYmE2YzIyNzU1NzY4NDQzNTU0Mw==
-  data.tar.gz: !binary |-
-    NjQ4ODE4NTEzMTliMmY5YjRkNjIxZmU2MWJkMjcwZTk5ZTc2OGQ0ZQ==
+SHA1:
+  metadata.gz: 9af6c6e5944dba21c3a02679fed84c94f6479593
+  data.tar.gz: d328c58d6060bce53d1a3287e0c4678bdbb19efa
 SHA512:
-  metadata.gz: !binary |-
-    YjRmYTcxODlhZjQ3OTEyZTBiOGJhY2I2NWQ4MzJlYWZkMzNmMzIyZWQ4MzIz
-    YjQ4Y2JlMDFkZTZlMGUxOTQwNTE5NzQwODk1YjVlMTM3Njc2ZjEyZTJkNGNh
-    YjgxN2RjYjIyNWU1NzE1NDJlZDY4MjJhYjhlYjNmNWJjYTllNGU=
-  data.tar.gz: !binary |-
-    MDE4NzJmOThhMWY2NTQ3ZTVkMWFhOWFlNGE4NzEyOGJmZTIyNWZiNDNjZmYw
-    OTc0MWMwMzYxYzM0NTg2MDEzYTBhZjgzYjcwMDYzYThkZjQyMzI4ODRmOGM2
-    YmFlZWYwZWViMDI0OGVhNzM5NWQyZTk1YWMzOWYwZWQ5MmRhMWY=
+  metadata.gz: 5fea19ab39c42c2bf88a0e5ebf52641f63672ce52204f824200df419f7b54ffe193cf8fdf2bf927d158ea272a804f371ee32d82d4cf5bd59be4c09898057b921
+  data.tar.gz: cc95a848a862ec798ad7cdf20630641ae7e567c16a51e899f6f540643350938813c3d28eff62432793d8c50fe0f74cdb18ff8cc65be1f3112e9454007aad38a9

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    adobe-aem-api (0.0.5)
+    adobe-aem-api (0.0.6)
+      multipart-post
       nokogiri
       recursive-open-struct
 
@@ -14,11 +15,12 @@ GEM
     diff-lcs (1.2.5)
     flexmock (0.9.0)
     metaclass (0.0.4)
-    mini_portile (0.5.3)
+    mini_portile (0.6.2)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     rack (1.5.2)
     rack-protection (1.5.3)
       rack

data/adobe-aem-api.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~>1.18.0'
   spec.add_runtime_dependency 'recursive-open-struct'
   spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'multipart-post'
 end

data/lib/adobe-aem-api.rb

@@ -3,6 +3,7 @@ require 'net/http'
 require 'json'
 require 'recursive-open-struct'
 require 'nokogiri'
+require 'net/http/post/multipart'
 
 self_dir = File.dirname(__FILE__)
 Dir["#{self_dir}/**/*.rb"].each do |lib|

data/lib/adobe/aem/api.rb

@@ -1,29 +1,32 @@
+require 'adobe/aem/replication'
+require 'adobe/aem/site_admin'
+require 'adobe/aem/system'
+require 'adobe/aem/crx_system'
+
 module Adobe
   module Aem
     class Api
       attr_reader :context
 
+      class << self
+        def proxy(name, klass)
+          define_method name do
+            klass.new(@context)
+          end
+        end
+      end
+
       def initialize(options = {})
         @context = Context.new
         @context.configuration = Configuration.new(options)
         @context.connector = Connector.new(@context)
       end
 
-      def replication
-        Replication.new(@context)
-      end
+      proxy :replication, Replication
+      proxy :system, System
+      proxy :crx, CrxSystem
+      proxy :siteadmin, SiteAdmin
 
-      def siteadmin
-        SiteAdmin.new(@context)
-      end
-
-      def system
-        System.new(@context)
-      end
-
-      def crx
-        CrxSystem.new(@context)
-      end
     end
   end
 end

data/lib/adobe/aem/connector.rb

@@ -34,6 +34,12 @@ module Adobe
         verify(response)
       end
 
+      def multipart_post(path, data = {}, headers = {})
+        post = request(path, 'POST', data)
+        response = http.request(post)
+        verify(response)
+      end
+
       def post(path, data = {}, headers = {})
         post = request(path, 'POST')
         post.form_data = data unless data.empty?
@@ -78,15 +84,19 @@ module Adobe
       end
 
       private
-      def request(path, type='GET')
+      def request(path, type='GET', data = {})
         r = if type == 'GET'
               Net::HTTP::Get.new(path)
+            elsif !data.empty?
+              Net::HTTP::Post::Multipart.new(path, data)
             else
               Net::HTTP::Post.new(path)
             end
+
         r.basic_auth @context.configuration.username, @context.configuration.password
         r['Accept'] = 'application/json'
-        r['Content-Type'] = 'application/json'
+        r['Content-Type'] = 'application/json' unless r.is_a?(Net::HTTP::Post::Multipart)
+
         r
       end
 
@@ -101,6 +111,8 @@ module Adobe
       def verify(response)
         raise StandardError.new(response.class.to_s) unless
             [Net::HTTPOK, Net::HTTPCreated, Net::HTTPFound].include?(response.class)
+
+        response
       end
 
       def parse_json(string)

data/lib/adobe/aem/jcr/node.rb

@@ -76,7 +76,6 @@ module Adobe
         private
         def set(name, value)
           field_name = name.to_s.gsub(/=$/, '')
-          puts "Setting #{@path} #{field_name} to #{value}"
           @context.connector.set(@path, field_name, value)
         end
       end

data/lib/adobe/aem/system.rb

@@ -1,3 +1,5 @@
+
+
 module Adobe
   module Aem
     class System
@@ -8,6 +10,32 @@ module Adobe
       def update_configuration(name, options)
         @context.connector.post("/system/console/configMgr/#{name}", options)
       end
+
+      def uninstall_bundle(name)
+        @context.connector.post("/system/console/bundles/#{name}", action: 'uninstall')
+      end
+      def stop_bundle(name)
+        @context.connector.post("/system/console/bundles/#{name}", action: 'stop')
+      end
+      def start_bundle(name)
+        @context.connector.post("/system/console/bundles/#{name}", action: 'start')
+      end
+
+      def refresh_bundle_imports(name)
+        @context.connector.post("/system/console/bundles/#{name}", action: 'refresh')
+      end
+
+      def install_bundle(path)
+        options = {
+          action: :install,
+          bundleStartLevel: 20
+        }
+
+        raise "File: #{path} does not exist" unless File.exists?(path)
+        options[:bundlefile] = UploadIO.new(path, 'application/java-archive')
+
+        @context.connector.multipart_post('/system/console/bundles', options)
+      end
     end
   end
 end

data/lib/adobe/aem/version.rb

@@ -1,5 +1,5 @@
 module Adobe
   module Aem
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/spec/api_spec.rb

@@ -5,11 +5,11 @@ module Adobe
     describe Api do
       describe 'Default values' do
         before(:all) do
-          @sinatra_app = MockAem.run
+          MockAem.run
         end
 
         after(:all) do
-          @sinatra_app.quit!
+          MockAem.quit!
         end
 
         subject do
@@ -38,8 +38,8 @@ module Adobe
       end
 
       it 'should return list of replication agents' do
-        subject.should have_at_least(2).agent_types
-        expect(subject).to have_at_least(1).agent_types
+        subject.should have_at_least(2).agents
+        expect(subject).to have_at_least(1).agents
 
         expect(subject.agents['agents.author']['publish-1']['jcr:content']['jcr:title']).to eq('Publish 1')
       end
@@ -48,6 +48,36 @@ module Adobe
         subject.create_agent('agents.author', 'stan')
       end
     end
+
+    describe "System" do
+      subject do
+        @options = {}
+        @options[:port] = 4567
+
+        Adobe::Aem::Api.new(@options).system
+      end
+
+      it "should uninstall a bundle" do
+        b = subject.uninstall_bundle("uk.sponte.bundle").body
+        expect(JSON.parse(b)["action"]).to eq("uninstall")
+      end
+
+      it "should refresh_package_imports" do
+        b = subject.refresh_bundle_imports("uk.sponte.bundle").body
+        expect(JSON.parse(b)["action"]).to eq("refresh")
+      end
+
+      it "should upload package" do
+        tempfile = Tempfile.new('upload_package.tmp')
+        tempfile.close
+
+        b = subject.install_bundle(tempfile.path).body
+        expect(JSON.parse(b)["action"]).to eq("install")
+
+        File.delete(tempfile.path)
+      end
+
+    end
   end
 end
 

data/spec/data/etc/replication/agents.author/publish-1/jcr:content.1.json

@@ -0,0 +1,20 @@
+{
+    "enabled": "true",
+    "jcr:description": "Agent that replicates to the default publish instance.",
+    "sling:resourceType": "cq/replication/components/agent",
+    "jcr:uuid": "24b0a1ed-79a1-4fd2-84b1-c3c7ac2b6f03",
+    "jcr:title": "Publish 1",
+    "jcr:mixinTypes": ["mix:versionable"],
+    "jcr:baseVersion": "db950b25-0639-49b0-a812-9b7388dda1e8",
+    "transportUser": "admin",
+    "jcr:isCheckedOut": true,
+    "jcr:primaryType": "nt:unstructured",
+    "cq:template": "/libs/cq/replication/templates/agent",
+    "jcr:predecessors": ["db950b25-0639-49b0-a812-9b7388dda1e8"],
+    "retryDelay": "60000",
+    "jcr:versionHistory": "9816f959-099e-49a5-af3e-8801de61ab83",
+    "logLevel": "info",
+    "transportPassword": "admin",
+    "transportUri": "http://azaem-pub1-test1.awsdev.telegraph.co.uk:4503/bin/receive?sling:authRequestLogin=1",
+    "serializationType": "durbo"
+}

data/spec/data/etc/replication/agents.author/stan.1.json

@@ -0,0 +1,25 @@
+{
+    "jcr:created": "Wed Aug 13 2014 09:05:55 GMT+0000",
+    "jcr:primaryType": "cq:Page",
+    "jcr:createdBy": "admin",
+    "jcr:content": {
+        "enabled": "true",
+        "jcr:description": "Agent that replicates to the default publish instance.",
+        "sling:resourceType": "cq/replication/components/agent",
+        "jcr:uuid": "24b0a1ed-79a1-4fd2-84b1-c3c7ac2b6f03",
+        "jcr:title": "Publish 1",
+        "jcr:mixinTypes": ["mix:versionable"],
+        "jcr:baseVersion": "db950b25-0639-49b0-a812-9b7388dda1e8",
+        "transportUser": "admin",
+        "jcr:isCheckedOut": true,
+        "jcr:primaryType": "nt:unstructured",
+        "cq:template": "/libs/cq/replication/templates/agent",
+        "jcr:predecessors": ["db950b25-0639-49b0-a812-9b7388dda1e8"],
+        "retryDelay": "60000",
+        "jcr:versionHistory": "9816f959-099e-49a5-af3e-8801de61ab83",
+        "logLevel": "info",
+        "transportPassword": "admin",
+        "transportUri": "http://azaem-pub1-test1.awsdev.telegraph.co.uk:4503/bin/receive?sling:authRequestLogin=1",
+        "serializationType": "durbo"
+    }
+}

data/spec/helpers/mock_aem.rb

@@ -7,4 +7,12 @@ class MockAem < Sinatra::Application
 
   set :static, true
   set :public_folder, File.join(File.dirname(__FILE__), '../data')
+
+  post '/bin/wcmcommand' do
+    '<html><div id=Location href=/etc/replication/agents.author/stan /></html>'
+  end
+
+  post '/system/console/bundles/?:id?' do
+  	params.to_json
+  end
 end

metadata

@@ -1,139 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: adobe-aem-api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stanislaw Wozniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides functionality to manage Adobe AEM instances.
@@ -143,8 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -170,6 +184,8 @@ files:
 - spec/data/etc/replication/agent.json
 - spec/data/etc/replication/agents.author.1.json
 - spec/data/etc/replication/agents.author/publish-1.1.json
+- spec/data/etc/replication/agents.author/publish-1/jcr:content.1.json
+- spec/data/etc/replication/agents.author/stan.1.json
 - spec/helpers/mock_aem.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -182,17 +198,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Adobe AEM Api gem
@@ -202,5 +218,8 @@ test_files:
 - spec/data/etc/replication/agent.json
 - spec/data/etc/replication/agents.author.1.json
 - spec/data/etc/replication/agents.author/publish-1.1.json
+- spec/data/etc/replication/agents.author/publish-1/jcr:content.1.json
+- spec/data/etc/replication/agents.author/stan.1.json
 - spec/helpers/mock_aem.rb
 - spec/spec_helper.rb
+has_rdoc: