appfog-vmc-plugin 0.1.10 → 0.1.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGNmZWI2YzAzNzU2N2NhMzc4MTVmYmZmMzQzM2JlMjQyN2EzZmRmNg==
+    ODE4YTFhZjgwNDk1Y2EwNmQ2YzUxYWQ1MmQ1MGExMmJkZDVkMGNhMQ==
   data.tar.gz: !binary |-
-    MzAyNjdhYmRiMzU2NjE3OWI3ZGFhM2RmOWExODg1M2QzNzhiODE5Yg==
+    MDUyYTAxYzMyNzhlYTkxMzYxMWQ2ZWU3NzNmYTRiOWMyYWE3MGUwZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTA4MzdkM2FhNjNlN2Q3M2Q0YThkYzc0NTEzOGQ3M2ZmZTQ2OGMwZTVjYzkz
-    MzNkN2ZkNjc3NDBmNDM2MzIyYWVkZTdhZGM0Yzk3YjY2OWU5MWI2N2E5ZmZl
-    NjVjMjNjNDdjN2RmNWY0YjM0NTQxNTY1NmUyYzU2MjI2MjljOTE=
+    YTBlYWVhYjg4NTEyYTBiYzZhMmMwNGU2ZTM1NjU4MGE3MTc1MjEzOTRmYTdj
+    Y2ZjNGYxZWE3YmVkYmI2Y2IyMGRiZjdhNTRlZTkzYzVjN2I3NDkxZTQyNzdm
+    MTNmMjdjM2VjMWJhYTJlMTBkNzQ0OGJjYWUzYTk3ZmU2OTUxMGU=
   data.tar.gz: !binary |-
-    ZDVkMjlhMTE1NzM3NTc4N2EyY2M5MzMxZmVkNThhMjM3Yjk0ODYyYzU0ZTg3
-    ZDEzODRmYzBkOWViNGE5N2QwMmVhMGMwZGIxNzM3NjJkZTE1YzJhZjNmODg0
-    OGNiNjA3NjNlNGIwMjg5ZjhkOGUyMTA1NTA3YjM3NTkxNWI4NTg=
+    ODk4YzM4MDk4ZDFhYzBiODlhMWQ0ZDkxZjkxYTQyZjgzMGU2NTAyNjMzMGM4
+    ZDhhNzY1MGJlZWQyM2VhYjM2MGQyZjFhYjBiYTgyZjM3MzcyODAwNTg0OTk2
+    Mjc1Y2ZkYTM1OGYwNjhjYzdmZDY3NzAwYTI2OTEwODc1M2IyYmU=

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

@@ -5,12 +5,8 @@ module CFoundry
 
       base = super(target)
 
-      # case base.info[:version]
-      # when 2
-      #   CFoundry::V2::Client.new(*args)
-      # else
-        CFoundry::V1::Client.new(*args)
-      # end
+      # Version 1 only
+      CFoundry::V1::Client.new(*args)
     end
   end
 end

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

@@ -48,5 +48,25 @@ module CFoundry
         end
       end
     end
+
+    def prune_empty_directories(path)
+      all_files = Dir["#{path}/**/{*,.*}"]
+      all_files.reject! { |fn| fn =~ /\/\.+$/ }
+
+      directories = all_files.select { |x| File.directory?(x) }
+      directories.sort! { |a, b| b.size <=> a.size }
+
+      directories.each do |directory|
+        entries = Dir.entries(directory) - %w{. ..}
+        if entries.empty?
+          # Better handling of symlinks
+          if !File.symlink?(directory)
+            FileUtils.rmdir(directory)
+          else
+            File.unlink(directory)
+          end
+        end
+      end
+    end
   end
 end

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

@@ -25,7 +25,10 @@ module CFoundry::V1
     end
 
     def infra_by_name(name)
-      infras.find { |i| i.name == name }
+      if name == "none"
+        return Infra.new("none", "none", "No infra selected", "no-infra.af.cm", "none", "none")
+      end
+      infras.find { |i| i.name == name } unless name.nil?
     end
 
     # Added to support downloads
@@ -51,7 +54,13 @@ module CFoundry::V1
     def services(options = {})
       services = []
 
-      @base.system_services.each do |infra, infra_services|
+      service_instances = @base.system_services
+
+      if options[:infras] != true
+        service_instances = { none: service_instances }
+      end
+
+      service_instances.each do |infra, infra_services|
         infra_services.each do |type, vendors|
           vendors.each do |vendor, providers|
             providers.each do |provider, properties|

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

@@ -1,3 +1,3 @@
 module VMCAppfog
-  VERSION = "0.1.10".freeze
+  VERSION = "0.1.11".freeze
 end

data/lib/appfog-vmc-plugin/vmc/user/base.rb

@@ -1,12 +1,6 @@
 module VMC
   module User
     class Base < CLI
-      def precondition
-        check_logged_in
-      end
-
-      private
-
       def validate_password!(password)
         validate_password_verified!(password)
         # validate_password_strength!(password)

data/lib/appfog-vmc-plugin/vmc/user/create.rb

@@ -0,0 +1,8 @@
+module VMC::User
+  class Create < Base
+
+    # Allows creation of users without logging in
+    def precondition; end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appfog-vmc-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Tim Santeford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -65,6 +65,7 @@ files:
 - lib/appfog-vmc-plugin/vmc/app/instances.rb
 - lib/appfog-vmc-plugin/vmc/start/login.rb
 - lib/appfog-vmc-plugin/vmc/user/base.rb
+- lib/appfog-vmc-plugin/vmc/user/create.rb
 - lib/appfog-vmc-plugin/vmc.rb
 - lib/manifests-vmc-plugin/errors.rb
 - lib/manifests-vmc-plugin/loader/builder.rb