lds-cf-plugin 0.3.4 → 0.3.5

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

@@ -0,0 +1,51 @@
+require "cf/cli"
+require "json"
+
+module LdsCfPlugin
+  class MarkLogicService < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Create a Marklogic Service"
+    group :lds, :services
+    input :name, :desc => "Name for your service", :argument => :optional
+
+    def create_marklogic_service
+      offerings = client.services
+      offerings.keep_if { |s| s.label == 'marklogic-service' && s.provider == 'ICS' }
+      service = offerings.first
+
+      if !service
+        fail "Cannot find Marklogic service on #{client.target}"
+      end
+      
+      if service.version != "0.1"
+        fail "Your lds-cf-plugin version is out of date.  To update execute `gem update lds-cf-plugin`"
+      end
+
+      rest_client = CFoundry::RestClient.new(service.url, client.token)
+      rest_client.trace = client.trace
+
+      instance_name = input[:name]
+      if !instance_name
+        instance_name = ask("Name")
+      end
+
+      plan = service.service_plans.first
+
+      # Create service instance
+      instance = client.managed_service_instance
+      instance.name = instance_name
+
+      instance.service_plan = plan
+      instance.space = client.current_space
+
+      with_progress("Creating service #{c(instance.name, :name)}") do
+        instance.create!
+      end
+
+      instance
+    end
+  end
+end

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

@@ -12,4 +12,5 @@ require "lds-cf-plugin/lds_account_service"
 require "lds-cf-plugin/http_service"
 require "lds-cf-plugin/wam_service"
 require "lds-cf-plugin/servicemanager_service"
+require "lds-cf-plugin/marklogic_service"
 require "lds-cf-plugin/tunnel"

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

@@ -79,30 +79,10 @@ module LdsCfPlugin
         env = ask("Service Manager environment to use", options)
       end
 
-
-      # Register service with gateway
-      choices = ["y","n"]
-      
       prexisting = input[:prexisting]
-      if !prexisting || !choices.include?(prexisting)
-        options = {
-          :choices => choices,
-          :display => proc { |choice|
-            if choice == "y"
-              "yes"
-            elsif choice == "n"
-              "no"
-            end
-          },
-          :default => "y",
-          :allow_other => false
-        }
-      	prexisting = ask("Use Pre-existing Service Manager application?",options)
-      end
-
-
+      prexisting = ask("Use existing Service Manager application CI for '#{sm_app_name}'?", :default => true) if !prexisting
 
-      if prexisting=='y' 
+      if prexisting 
       payload = {
           :space_guid => client.current_space.guid,
           :name => instance_name,
@@ -115,28 +95,28 @@ module LdsCfPlugin
 
       dutyPhone = input[:dutyPhone]
       if !dutyPhone
-        dutyPhone = ask("Duty Phone (e.g. 1 801 555 5555 ")
+        dutyPhone = ask("Duty Phone (e.g. 1 801 555 5555)")
       end
 
       primaryContact = input[:primaryContact]
       if !primaryContact
-        primaryContact = ask("Primary Contact")
+        primaryContact = ask("Primary Contact (LDS Account)")
       end
 
       solutionManager = input[:solutionManager]
       if !solutionManager
-        solutionManager = ask("Solution Manager")
+        solutionManager = ask("Solution Manager (LDS Account)")
       end
 
       supportGroup = input[:supportGroup]
       if !supportGroup
-        supportGroup = ask("Support Group")
+        supportGroup = ask("Support Group (e.g. CHQ-OPS-SOMEGROUP)")
       end
 
 
       portfolioId = input[:portfolioId]
       if !portfolioId
-        portfolioId = ask("Portfolio ID")
+        portfolioId = ask("Portfolio ID (e.g. 1234567)")
       end
 
       payload = {
@@ -168,6 +148,7 @@ module LdsCfPlugin
         request, response = rest_client.request("POST", "/register", options)
         if response[:status].to_i != 200
           fail "Error registering Service Manager app with gateway:\n#{response[:body]}"
+          fail "Try creating your service using the web ui instead.  It does a better job of validating parameters: https://ui.cf.lds.org/#/ServiceMarketplace"
         end
       end
 

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

@@ -117,8 +117,8 @@ module LdsCfPlugin
       tunnel_console do |instances|
         visualvm = input[:jvisualvm] ? input[:jvisualvm] : "jvisualvm"
         EventMachine::defer do
-          if system("''#{visualvm}'' -cp:a #{JMXMP_JAR_FILE}") == nil
-            fail("Unable to run '#{visualvm}'. Is it in your PATH?")
+          if system("\"#{visualvm}\" -cp:a \"#{JMXMP_JAR_FILE}\"") == nil
+            fail("Unable to run '#{visualvm}'. Is it in your PATH?  If not you can specify where visual vm is with --jvisualvm (e.g. cf visualvm some-app --jvisualvm \"c:/java/bin/jvisualvm.exe\"")
           end
         end
 
@@ -131,7 +131,7 @@ module LdsCfPlugin
           instances.each do |instance|
             jmxurl = "service:jmx:jmxmp://#{host}:#{port}"
             puts "Adding instance #{c('#' + instance.id, :instance)} to VisualVM (#{c(jmxurl, :instance)})"
-            system("''#{visualvm}'' --openjmx #{jmxurl}")
+            system("\"#{visualvm}\" --openjmx #{jmxurl}")
             port = port + 1
           end
         end

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

@@ -1,3 +1,3 @@
 module LdsCfPlugin
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lds-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
-- !ruby/object:Gem::Dependency
-  name: cfoundry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.3.6
+        version: 5.4.4
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +70,7 @@ files:
 - 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/marklogic_service.rb
 - lib/lds-cf-plugin/oracle_service.rb
 - lib/lds-cf-plugin/tunnel.rb
 - lib/lds-cf-plugin/version.rb