appfog-vmc-plugin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTYwZGMwNDRmMzRkYWRlY2I2ZDAwZTliZTZmYjUwMmEyYjU1NzUzMw==
+    N2Y0N2M1MGVlNzMyNWUzYjM3YzI2ZDJkNzdlZjYxZTkwZTU4MzlmMA==
   data.tar.gz: !binary |-
-    ZWY2NDliZmYyYzZmY2M4NDg0M2UzNjg5NTEwNDJkZDE1YjRlNDgzYw==
+    MzA3ODY0MDEzODJkZWMxNmU3MGU3ZWExZjQwMGMxZTE3ZjZlYjkyYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGViZmM4NWI2Njc2YWI1NjNkMmEyOTk1MDBkNTMzYTBiNTE2ZDI4MDM4OWE0
-    OWNkNmY2ZWJkY2FhNDEyN2U1ZTU2NzhlYjBlODE3ZWY4MDY1OTk1YTU2YzNk
-    MDgwM2UzM2EyMzFkM2JhMTZmY2M3ZTE5ODY2ZjNiNjkxMTk1NTk=
+    ODQyOWUwOTIxYTI5MzU1OWY1NmVhNjQwNWVkMzNkMTczYjU4M2U1ZjgwZjAy
+    NDZhN2FiN2EzY2U4YzhkYWY3MTMwYjZiMGI5MmY0NTIzNmI5MmI2Njc3OWRj
+    NTkzZjdiNWUxZTViNjViNjE1MGYxN2UyOWUyOTUyOTljZDkzNWM=
   data.tar.gz: !binary |-
-    MjUzZjY5OWVjMDcxNzE5NjY4YzE4ODkzOTZjOTQ2NTIzY2I3NTgzNDIyMTI3
-    YTFhODUyM2JkMDMzMWM2ODMzNmMyYjBmY2UyNWU0ZjA2ODQzNjczZDQ1YzU2
-    MmM5MjdjYTFmNTNiMjgxYzVhNzIxZTdhYjRjYTRhOGYzYTJmNmI=
+    YjRlOTExOTZlNzBiNDg0ZmM1NjBkZDk0ZTg4MTllNjhmYzU4OWUzOWFiZDgw
+    ZjA5NzdlNTY0MDE5ZTMyYjE0MjA5NjJmNGJmZjQwY2JhMTQ3OGQ4ZmFlNzZl
+    MzkzZDFjNTZkOTJjZWUwZjM4YTE1OGZiMWZiYmM1YTU1NDYzNWI=

data/lib/appfog-vmc-plugin/cfoundry/baseclient.rb

@@ -0,0 +1,29 @@
+module CFoundry
+  class BaseClient
+    def get(*args)
+      options = args.reduce({}) do |opts, arg|
+        arg.is_a?(Hash) ? arg : opts
+      end
+      tries = options.has_key?(:retry) && options[:retry] == false ? 1 : 3
+      delay = options.has_key?(:delay) ? options[:delay] : 10
+      with_retry(tries, delay, [CFoundry::TargetRefused, CFoundry::BadResponse]) do
+        request("GET", *args)
+      end
+    end
+
+    def with_retry(tries, delay=2, exceptions=[])
+      try_count = 0
+      loop do
+        begin
+          try_count += 1
+          return yield
+        rescue Exception => e
+          if try_count > tries || !exceptions.include?(e.class)
+            raise e
+          end
+          sleep delay * try_count
+        end
+      end
+    end
+  end
+end

data/lib/appfog-vmc-plugin/cfoundry/v1/client.rb

@@ -74,7 +74,7 @@ module CFoundry::V1
     end
 
     def export_service(service_name)
-      @base.get("services", "export", service_name, :accept => :json)
+      @base.get("services", "export", service_name, :accept => :json, :retry => false)
     end
 
     def import_service(service_name, uri)

data/lib/appfog-vmc-plugin/cfoundry.rb

@@ -1,4 +1,4 @@
-command_files = "../cfoundry/*/*.rb"
+command_files = "../cfoundry/**/*.rb"
 Dir[File.expand_path(command_files, __FILE__)].each do |file|
   require file
 end

data/lib/appfog-vmc-plugin/commands/export.rb

@@ -5,7 +5,7 @@ module VMCAppfog
     input :service, :desc => "Service to export", :argument => :optional,
           :from_given => by_name(:service_instance, "service")
     def export_service
-      service = input[:export_service]
+      service = input[:service]
 
       export_info =
         with_progress("Exporting service #{c(service.name, :name)}") do

data/lib/appfog-vmc-plugin/commands/import.rb

@@ -6,7 +6,7 @@ module VMCAppfog
           :from_given => by_name(:service_instance, "service")
     input :url, :desc => "Data url to import", :argument => :optional
     def import_service
-      service = input[:import_service]
+      service = input[:service]
       url = input[:url]
 
       import_info =

data/lib/appfog-vmc-plugin/commands/map.rb

@@ -0,0 +1,30 @@
+module VMCAppfog
+  class Map < VMC::CLI
+    def precondition; end
+
+    desc "Add a URL mapping"
+    group :apps, :info
+    input :app, :desc => "Application to add the URL to",
+          :argument => :optional, :from_given => by_name(:app)
+    input :url, :desc => "URL to map", :argument => :optional
+    def map
+      app = input[:app]
+      url = input[:url]
+
+      with_progress("Updating #{c(app.name, :name)}") do
+        app.urls << url
+        app.update!
+      end
+    end
+
+    private
+
+    def ask_app
+      ask("Which application?", :choices => client.apps, :display => proc(&:name))
+    end
+
+    def ask_url
+      ask("Enter URL?")
+    end
+  end
+end

data/lib/appfog-vmc-plugin/commands/unmap.rb

@@ -0,0 +1,45 @@
+module VMCAppfog
+  class Unmap < VMC::CLI
+    desc "Remove a URL mapping"
+    group :apps, :info
+    input :app, :desc => "Application to remove the URL from",
+          :argument => :optional, :from_given => by_name(:app)
+    input :url, :desc => "URL to unmap", :argument => :optional
+    input :all, :desc => "Act on all routes", :type => :boolean
+    def unmap
+      app = input[:app]
+
+      fail "No urls to unmap." if app.urls.empty?
+
+      url = input[:url, (app.urls.map{|url| OpenStruct.new({name: url})})] unless input[:all]
+      if url.is_a? String
+        url = OpenStruct.new({name: url})
+      end
+
+      with_progress("Updating #{c(app.name, :name)}") do |s|
+        if input[:all]
+          app.urls = []
+        else
+
+          simple = url.name.sub(/^https?:\/\/(.*)\/?/i, '\1')
+
+          unless app.urls.delete(simple)
+            fail "URL #{url.name} is not mapped to this application."
+          end
+        end
+
+        app.update!
+      end
+    end
+
+    private
+
+    def ask_app
+      ask("Which application?", :choices => client.apps, :display => proc(&:name))
+    end
+
+    def ask_url(choices)
+      ask("Which URL?", :choices => choices.sort_by(&:name), :display => proc(&:name))
+    end
+  end
+end

data/lib/appfog-vmc-plugin/version.rb

@@ -1,3 +1,3 @@
 module VMCAppfog
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appfog-vmc-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tim Santeford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
+- lib/appfog-vmc-plugin/cfoundry/baseclient.rb
 - lib/appfog-vmc-plugin/cfoundry/upload_helpers.rb
 - lib/appfog-vmc-plugin/cfoundry/v1/app.rb
 - lib/appfog-vmc-plugin/cfoundry/v1/base.rb
@@ -48,8 +49,10 @@ files:
 - lib/appfog-vmc-plugin/commands/frameworks.rb
 - lib/appfog-vmc-plugin/commands/import.rb
 - lib/appfog-vmc-plugin/commands/infra.rb
+- lib/appfog-vmc-plugin/commands/map.rb
 - lib/appfog-vmc-plugin/commands/pull.rb
 - lib/appfog-vmc-plugin/commands/runtimes.rb
+- lib/appfog-vmc-plugin/commands/unmap.rb
 - lib/appfog-vmc-plugin/deprecated/env.rb
 - lib/appfog-vmc-plugin/deprecated/mem.rb
 - lib/appfog-vmc-plugin/help.rb