lds-cf-plugin 0.3.0 → 0.3.1

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

@@ -11,11 +11,6 @@ module LdsCfPlugin
     group :lds, :services
     input :name, :desc => "Name for your service", :argument => :optional
     input :credentials, :desc => "The service credentials JSON string to be passed to the application", :argument => :optional
-    input :plan, :desc => "Service plan",
-          :from_given => find_by_name_insensitive("plan"),
-          :default => proc {
-            interact
-          }
     def create_custom_service
       offerings = client.services
       offerings.keep_if { |s| s.label == 'custom-service' && s.provider == 'ICS' }
@@ -24,6 +19,10 @@ module LdsCfPlugin
       if !service
         fail "Cannot find custom 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
@@ -33,15 +32,6 @@ module LdsCfPlugin
         instance_name = ask("Name")
       end
 
-      if plan = input.direct(:plan)
-        service.reject! do |s|
-          if plan.is_a?(String)
-            s.service_plans.none? { |p| p.name == plan.upcase }
-          else
-            s.service_plans.include? plan
-          end
-        end
-      end
       plan = service.service_plans.first
 
       credentials = input[:credentials]
@@ -68,7 +58,7 @@ module LdsCfPlugin
 
 
       # Create service instance
-      instance = client.service_instance
+      instance = client.managed_service_instance
       instance.name = instance_name
 
       instance.service_plan = plan
@@ -80,18 +70,5 @@ module LdsCfPlugin
 
       instance
     end
-
-    private
-
-    def ask_plan(plans, default_plan = nil)
-      ask "Which plan?",
-          :choices => plans.sort_by(&:name),
-          :indexed => true,
-          :display => proc { |p| "#{p.name}: #{p.description || 'No description'}" },
-          :default => default_plan,
-          :complete => proc(&:name)
-    end
-
   end
-
 end

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

@@ -0,0 +1,116 @@
+require "cf/cli"
+require "json"
+require "uri"
+
+module LdsCfPlugin
+  class HttpService < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Create an Http service"
+    group :lds, :services
+    input :name, :desc => "Name for your service", :argument => :optional
+    input :url, :desc => "The http URL you wish to add as a service.", :argument => :optional
+
+    def create_http_service
+      offerings = client.services
+      offerings.keep_if { |s| s.label == 'http-service' && s.provider == 'ICS' }
+      service = offerings.first
+
+      if !service
+        fail "Cannot find Http 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
+
+      url = input[:url]
+      while !url || !is_valid_url(url)[0]
+        success, result = is_valid_url(url);
+        if url && !success
+          line c("The url you provided #{b("'#{url}'")} is not valid.", :bad)
+          line c("Error: #{result}", :bad) unless result.nil?
+        end
+        url = ask("URL")
+      end
+      
+      parsedUrl = URI.parse(url)
+      
+      prompt_credentials = parsedUrl.user.nil? 
+      if !input[:url]
+        prompt_credentials = ask("Provide Credentials?", :default => false) if parsedUrl.user.nil? && input[:username].nil?
+      else
+        prompt_credentials = false
+      end
+      
+      username = input[:username]
+      if !username && prompt_credentials
+        username = ask("Username")
+      end
+
+      password = input[:password]
+      if !password && prompt_credentials
+        password = ask("Password", :echo => "*", :forget => true, :default => "")
+      end
+
+      # Register service with gateway
+
+      payload = {
+          :space_guid => client.current_space.guid,
+          :name => instance_name,
+          :url => url,
+      }
+      if parsedUrl.user.nil?
+        payload[:username] = username
+        payload[:password] = password
+      end
+      options = {
+          :payload => JSON.generate(payload)
+      }
+      request, response = rest_client.request("POST", "/register", options)
+      if response[:status].to_i != 200
+        fail "Error registering Http service with gateway:\n#{response[:body]}"
+      end
+
+
+      # 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
+
+    def is_valid_url(url)
+      begin
+        parsedUrl = URI.parse(url)
+        unless(parsedUrl.scheme == "https" || parsedUrl.scheme == "http")
+          return false, "Scheme '#{parsedUrl.scheme}' is invalid."
+        end
+      rescue => e
+        return false, e.message
+      end
+      return true, nil
+    end
+    
+  end
+
+end

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

@@ -0,0 +1,113 @@
+require "cf/cli"
+require "json"
+
+module LdsCfPlugin
+  class LDSAccountService < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Create an LDS Account service"
+    group :lds, :services
+    input :name, :desc => "Name for your service", :argument => :optional
+    input :env, :desc => "LDS Account Environment (prod, stage, community)", :argument => :optional
+    input :cn, :desc => "The application account Common Name (cn)", :argument => :optional
+    input :password, :desc => "The password used to connect to the database", :argument => :optional
+
+    def create_lds_account_service
+      offerings = client.services
+      offerings.keep_if { |s| s.label == 'lds-account-service' && s.provider == 'ICS' }
+      service = offerings.first
+
+      if !service
+        fail "Cannot find LDS Account 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
+
+      choices = ["prod", "stage", "community"]
+      
+      env = input[:env]
+      if !env || !choices.include?(env)
+        options = {
+          :choices => choices,
+          :display => proc { |choice|
+            if choice == "prod"
+              "Prod (gdir)"
+            elsif choice == "stage"
+              "Stage (gdirstage)"
+            elsif choice == "community"
+              "Community (cdir)"
+            end
+          },
+          :default => "prod",
+          :allow_other => false
+        }
+        env = ask("LDS Account environment to use", options)
+      end
+
+      cn = input[:cn]
+      while !cn || !is_valid_cn(cn)
+        if cn && !is_valid_cn(cn)
+          line c("The cn you provided #{b("'#{cn}'")} is invalid.", :bad)
+          line c("Perhaps you tried providing a fully qualified principal?  We only want the cn= portion.  Try again.", :bad)
+        end
+        cn = ask("Application account principal Common Name (cn)")
+      end
+
+      password = input[:password]
+      if !password
+        password = ask("Application account password", :echo => "*", :forget => true)
+      end
+
+      # Register service with gateway
+
+      payload = {
+          :space_guid => client.current_space.guid,
+          :name => instance_name,
+          :env => env,
+          :cn => cn,
+          :password => password
+      }
+      options = {
+          :payload => JSON.generate(payload)
+      }
+      request, response = rest_client.request("POST", "/register", options)
+      if response[:status].to_i != 200
+        fail "Error registering LDS Account service with gateway:\n#{response[:body]}"
+      end
+
+
+      # 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
+
+    def is_valid_cn(cn)
+      !(cn.include?("cn=") || cn.include?("ou=") || cn.include?("o=")|| cn.include?(","))
+    end
+    
+  end
+
+end

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

@@ -2,7 +2,7 @@ require "cf/cli"
 require "json"
 
 module LdsCfPlugin
-  class CustomService < CF::CLI
+  class OracleService < CF::CLI
     def precondition
       check_target
     end
@@ -12,12 +12,8 @@ module LdsCfPlugin
     input :name, :desc => "Name for your service", :argument => :optional
     input :service, :desc => "The Oracle database to connect to", :argument => :optional
     input :schema, :desc => "The schema (user) to use", :argument => :optional
-    input :password, :desc => "The password used to conenct to the database", :argument => :optional
-    input :plan, :desc => "Service plan",
-          :from_given => find_by_name_insensitive("plan"),
-          :default => proc {
-            interact
-          }
+    input :password, :desc => "The password used to connect to the database", :argument => :optional
+
     def create_oracle_service
       offerings = client.services
       offerings.keep_if { |s| s.label == 'oracle-service' && s.provider == 'ICS' }
@@ -26,6 +22,10 @@ module LdsCfPlugin
       if !service
         fail "Cannot find Oracle 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
@@ -35,15 +35,6 @@ module LdsCfPlugin
         instance_name = ask("Name")
       end
 
-      if plan = input.direct(:plan)
-        service.reject! do |s|
-          if plan.is_a?(String)
-            s.service_plans.none? { |p| p.name == plan.upcase }
-          else
-            s.service_plans.include? plan
-          end
-        end
-      end
       plan = service.service_plans.first
 
       service = input[:service]
@@ -80,7 +71,7 @@ module LdsCfPlugin
 
 
       # Create service instance
-      instance = client.service_instance
+      instance = client.managed_service_instance
       instance.name = instance_name
 
       instance.service_plan = plan
@@ -92,18 +83,5 @@ module LdsCfPlugin
 
       instance
     end
-
-    private
-
-    def ask_plan(plans, default_plan = nil)
-      ask "Which plan?",
-          :choices => plans.sort_by(&:name),
-          :indexed => true,
-          :display => proc { |p| "#{p.name}: #{p.description || 'No description'}" },
-          :default => default_plan,
-          :complete => proc(&:name)
-    end
-
   end
-
 end

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

@@ -8,4 +8,7 @@ Mothership::Help.groups(
 
 require "lds-cf-plugin/custom_service"
 require "lds-cf-plugin/oracle_service"
+require "lds-cf-plugin/lds_account_service"
+require "lds-cf-plugin/http_service"
+require "lds-cf-plugin/wam_service"
 require "lds-cf-plugin/tunnel"

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

@@ -117,7 +117,7 @@ module LdsCfPlugin
       tunnel_console do |instances|
         visualvm = input[:jvisualvm] ? input[:jvisualvm] : "jvisualvm"
         EventMachine::defer do
-          if system("#{visualvm} -cp:a #{JMXMP_JAR_FILE}") == nil
+          if system("''#{visualvm}'' -cp:a #{JMXMP_JAR_FILE}") == nil
             fail("Unable to run '#{visualvm}'. Is it in your PATH?")
           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.0".freeze
+  VERSION = "0.3.1".freeze
 end

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

@@ -0,0 +1,51 @@
+require "cf/cli"
+require "json"
+
+module LdsCfPlugin
+  class WamService < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Create a Wam Service"
+    group :lds, :services
+    input :name, :desc => "Name for your service", :argument => :optional
+
+    def create_wam_service
+      offerings = client.services
+      offerings.keep_if { |s| s.label == 'wam-service' && s.provider == 'ICS' }
+      service = offerings.first
+
+      if !service
+        fail "Cannot find Wam 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lds-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cfoundry
+  name: cf
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -67,12 +67,15 @@ 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/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/tunnel/tunnelclient.rb
+- lib/lds-cf-plugin/wam_service.rb
 homepage: http://ui.app.lds.org/
 licenses: []
 post_install_message: