lds-cf-plugin 0.4.2 → 0.4.4

data/lib/lds-cf-plugin/app_dynamics_service.rb

@@ -13,7 +13,7 @@ module LdsCfPlugin
 
     def create_app_dynamics_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'app-dynamics-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'app-dynamics-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service

data/lib/lds-cf-plugin/custom_service.rb

@@ -13,7 +13,7 @@ module LdsCfPlugin
     input :credentials, :desc => "The service credentials JSON string to be passed to the application", :argument => :optional
     def create_custom_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'custom-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'custom-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service

data/lib/lds-cf-plugin/enterprise_ws_service.rb

@@ -17,14 +17,14 @@ module LdsCfPlugin
 
     def create_enterprise_ws_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'enterprise-ws-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'enterprise-ws-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service
         fail "Cannot find the Enterprise WS service on #{client.target}"
       end
       
-      if service.version != "0.1"
+      if service.version != "0.2" && service.version != "0.1"
         fail "Your lds-cf-plugin version is out of date.  To update execute `gem update lds-cf-plugin`"
       end
 

data/lib/lds-cf-plugin/http_service.rb

@@ -15,7 +15,7 @@ module LdsCfPlugin
 
     def create_http_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'http-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'http-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service

data/lib/lds-cf-plugin/lds_account_service.rb

@@ -16,7 +16,7 @@ module LdsCfPlugin
 
     def create_lds_account_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'lds-account-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'lds-account-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service

data/lib/lds-cf-plugin/marklogic_service.rb

@@ -10,10 +10,15 @@ module LdsCfPlugin
     desc "Create a Marklogic Service"
     group :lds, :services
     input :name, :desc => "Name for your service", :argument => :optional
+    input :plan, :desc => "The plan for your service.  (Existing, or Provisioned)", :argument => :optional
+    input :host, :desc => "The hostname the marklogic database is listening on if using 'Existing' plan.", :argument => :optional
+    input :port, :desc => "The port the marklogic database is listening on if using 'Existing' plan.", :argument => :optional
+    input :username, :desc => "The user to use if using 'Existing' plan.", :argument => :optional
+    input :password, :desc => "The password used to connect to the database if using 'Existing' plan.", :argument => :optional
 
     def create_marklogic_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'marklogic-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'marklogic-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service
@@ -32,13 +37,95 @@ module LdsCfPlugin
         instance_name = ask("Name")
       end
 
-      plan = service.service_plans.first
+      plans = service.service_plans
+
+      selected_plan = nil
+
+      plans.each do |plan|
+        selcted_plan = plan if plan.name == input[:plan]
+      end unless input[:plan].nil?
+
+      existing_plan = nil?
+      plans.each do | plan |
+        existing_plan = plan if plan.name == "Existing"
+      end
+
+      provision_plan = nil?
+      plans.each do | plan |
+        provision_plan = plan if plan.name == "Default"
+      end
+
+      plan_type = nil
+      plan_type = "Default" unless existing_plan.nil?
+
+      if(plans.length > 1 && !existing_plan.nil? && selected_plan.nil?)
+        choices = ["Existing", "Provision New"]
+        options = {
+          :choices => choices,
+          :default => "Existing",
+          :allow_other => false
+        }
+        plan_type = ask("What type of Marklogic Service", options)
+      end
+
+      if plan_type == "Existing"
+        selected_plan = existing_plan
+
+        host = input[:host]
+        if !host
+          host = ask("Marklogic host")
+        end
+
+        port = input[:port]
+        if !port
+          port = ask("Marklogic Port")
+        end
+
+        username = input[:username]
+        if !username
+          username = ask("Marklogic User")
+        end
+
+        password = input[:password]
+        if !password
+          password = ask("Marklogic password", :echo => "*", :forget => true)
+        end
+
+        # Register service with gateway
+
+        payload = {
+            :space_guid => client.current_space.guid,
+            :name => instance_name,
+            :host => host,
+            :port => port,
+            :username => username, 
+            :password => password
+        }
+        options = {
+            :payload => JSON.generate(payload)
+        }
+        request, response = rest_client.request("POST", "/register", options)
+        if response[:status].to_i != 200
+          fail "Error registering Marklogic service with gateway:\n#{response[:body]}"
+        end
+      else
+        selected_plan = provision_plan
+        #plans.delete(existing_plan) unless existing_plan.nil?
+        #options = {
+        #  :choices => plans,
+        #  :display => proc { |choice|
+        #    "#{choice.name}: #{choice.description}"
+        #  },
+        #  :allow_other => false
+        #}
+        #selected_plan = ask("What type of plan do you want", options)
+      end
 
       # Create service instance
       instance = client.managed_service_instance
       instance.name = instance_name
 
-      instance.service_plan = plan
+      instance.service_plan = selected_plan
       instance.space = client.current_space
 
       with_progress("Creating service #{c(instance.name, :name)}") do

data/lib/lds-cf-plugin/oracle_service.rb

@@ -17,7 +17,7 @@ module LdsCfPlugin
 
     def create_oracle_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'oracle-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'oracle-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service

data/lib/lds-cf-plugin/servicemanager_service.rb

@@ -24,7 +24,7 @@ module LdsCfPlugin
 
     def create_servicemanager_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'servicemanager-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'servicemanager-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service

data/lib/lds-cf-plugin/version.rb

@@ -1,3 +1,3 @@
 module LdsCfPlugin
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.4".freeze
 end

data/lib/lds-cf-plugin/wam_service.rb

@@ -13,7 +13,7 @@ module LdsCfPlugin
 
     def create_wam_service
       offerings = client.services
-      offerings.keep_if { |s| s.label == 'wam-service' && s.provider == 'ICS' }
+      offerings.keep_if { |s| s.label == 'wam-service' && s.provider.start_with?('ICS') && s.active }
       service = offerings.first
 
       if !service

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lds-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.5
+        version: 5.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.5
+        version: 5.4.7
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -99,26 +99,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- lib/lds-cf-plugin/http_service.rb
-- lib/lds-cf-plugin/custom_service.rb
-- lib/lds-cf-plugin/lds_account_service.rb
+- lib/lds-cf-plugin/app_dynamics_service.rb
+- lib/lds-cf-plugin/version.rb
 - lib/lds-cf-plugin/enterprise_ws_service.rb
-- lib/lds-cf-plugin/marklogic_service.rb
 - lib/lds-cf-plugin/oracle_service.rb
-- lib/lds-cf-plugin/tunnel.rb
-- lib/lds-cf-plugin/version.rb
-- lib/lds-cf-plugin/plugin.rb
-- lib/lds-cf-plugin/app_dynamics_service.rb
-- lib/lds-cf-plugin/loggregator/log_message_extender.rb
-- lib/lds-cf-plugin/loggregator/tailling_logs_client.rb
+- lib/lds-cf-plugin/loggregator/logs.rb
 - lib/lds-cf-plugin/loggregator/client_config.rb
 - lib/lds-cf-plugin/loggregator/log_message.pb.rb
+- lib/lds-cf-plugin/loggregator/tailling_logs_client.rb
 - lib/lds-cf-plugin/loggregator/message_writer.rb
-- lib/lds-cf-plugin/loggregator/logs.rb
 - lib/lds-cf-plugin/loggregator/log_message.proto
-- lib/lds-cf-plugin/tunnel/tunnelclient.rb
-- lib/lds-cf-plugin/wam_service.rb
+- lib/lds-cf-plugin/loggregator/log_message_extender.rb
+- lib/lds-cf-plugin/plugin.rb
+- lib/lds-cf-plugin/marklogic_service.rb
+- lib/lds-cf-plugin/lds_account_service.rb
 - lib/lds-cf-plugin/servicemanager_service.rb
+- lib/lds-cf-plugin/wam_service.rb
+- lib/lds-cf-plugin/tunnel.rb
+- lib/lds-cf-plugin/tunnel/tunnelclient.rb
+- lib/lds-cf-plugin/custom_service.rb
+- lib/lds-cf-plugin/http_service.rb
 homepage: https://cf.lds.org/
 licenses: []
 post_install_message: