vmc_knife 0.0.68 → 0.0.69

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTY0OTJhY2EyYWQ2OTAxNGQ3YjJhZTM3MDA1Y2RlZWE3MzM4MzRkZQ==
-  data.tar.gz: !binary |-
-    OWYwMGE5MmJmMGNlN2Y1NTc3NzM4NDJmYTI2MzA3ODIzOTkwNDMxNQ==
+SHA1:
+  metadata.gz: dd20eef97ec8f8e1c8f6ab6233173d2542444639
+  data.tar.gz: 4eabbc37feceaf7786c726f4b9595446a9e3af49
 SHA512:
-  metadata.gz: !binary |-
-    NzgwMGZhN2E1M2NlMmUwYjhlMjZmNzIyYjM3NjEzNTQ5ZDFjN2JjNTg4NmE3
-    ZDVjNTY2MzgwM2ZmNWFjODBlZDZkODJlOGM3ZGQzYjIwOTVmYWQzOGE4OWI4
-    ODliOGVlNmQ4MjA0OTM5ZTFhNzk3YmIzMDIxYTU1NWRiZmQ2YjU=
-  data.tar.gz: !binary |-
-    NGRkMTcyOTE0OTczZThjOTk2M2ZlZDU2M2M0N2NkMDkxNzM0Mzc2NmRhOWE2
-    MTAxNzMxMmVkYzgwNzhiZDhiMjgxMzk2NDRjY2I3ZWQxMzIyODJlZWFhZjg3
-    NjlkYjIzOTk1NTMyM2Q3ZThjOGJjNWMzMmFjNjVlNWUyMmFjNTg=
+  metadata.gz: b36c181301be5fb4a8c8784e9cf9b7b7db068e42706133936181db51a7c6e55823a248de916221d37f67a8d2f3ba46963787fa0d522143395d9c3baa953a9ba3
+  data.tar.gz: 75690deb70f18526f7d495ec784753cd3345bee4fd9448627cb8d390d5ef0586f672027d71d2ca34bc82be8b142d8cc35de3b26c06156a4cccf86409d6cbdc78

data/lib/vmc_knife/data_services.rb

@@ -30,13 +30,13 @@ module VMC
         
     def self.get_app_id(app_name)
        db=get_ccdb_credentials()
-       app_id = `psql --username #{db['username']} --dbname #{db['database']} -c \"select id from apps where name='#{app_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
+       app_id = `export PGPASSWORD=#{db['password']}; psql --host #{db['host']} --port #{db['port']} --username #{db['username']} --dbname #{db['database']} -c \"select id from apps where name='#{app_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
        app_id unless app_id.empty?
     end
     def self.get_service_config_id(service_name)
        db=get_ccdb_credentials()
        #todo add the user_id
-       service_config_id = `psql --username #{db['username']} --dbname #{db['database']} -c \"select id from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
+       service_config_id = `export PGPASSWORD=#{db['password']}; psql --host #{db['host']} --port #{db['port']} --username #{db['username']} --dbname #{db['database']} -c \"select id from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
        service_config_id unless service_config_id.empty?
     end
     
@@ -65,7 +65,7 @@ module VMC
     def self.get_credentials(service_name, app_name=nil)
        db=get_ccdb_credentials()
        if app_name.nil?
-         credentials_str = `psql --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
+         credentials_str = `export PGPASSWORD=#{db['password']}; psql --host #{db['host']} --port #{db['port']} --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
        else
          app_id = get_app_id(app_name)
 				 if app_id.nil?
@@ -73,7 +73,7 @@ module VMC
 					 return
 				 end
          service_config_id = get_service_config_id(service_name)
-         credentials_str = `psql --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_bindings where app_id = '#{app_id}' and service_config_id='#{service_config_id}'\" #{PSQL_RAW_RES_ARGS}`.strip
+         credentials_str = `export PGPASSWORD=#{db['password']}; psql --host #{db['host']} --port #{db['port']} --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_bindings where app_id = '#{app_id}' and service_config_id='#{service_config_id}'\" #{PSQL_RAW_RES_ARGS}`.strip
        end
        res = Hash.new
        credentials_str.split("\n").each do | line |
@@ -408,8 +408,9 @@ module VMC
           instance_name=creds['name']
           dbpath=File.join(base_dir, instance_name, 'data')            
           mongod_lock=File.join(dbpath,'mongod.lock')
-          puts "looking at #{mongod_lock} exists? #{File.exists?(mongod_lock)} size #{File.size(mongod_lock)}"
-          if File.exists?(mongod_lock) && File.size(mongod_lock)>0
+          hostname = creds['hostname']
+          puts "looking at #{mongod_lock} exists? #{File.exists?(mongod_lock)} size #{File.size(mongod_lock)}" if File.exists?(mongod_lock)
+          if (File.exists?(mongod_lock) && File.size(mongod_lock)>0) || (hostname != '127.0.0.1' &&  hostname != 'localhost')
             cmd = "#{mongodump_exec} -u #{creds['username']} -p #{creds['password']} --host #{creds['hostname']}:#{creds['port']} --db db"
           else
             cmd = "#{mongodump_exec} --dbpath #{dbpath}"

data/lib/vmc_knife/version.rb

@@ -2,7 +2,7 @@ module VMC
   module KNIFE
     module Cli
       # This version number is used as the RubyGem release version.
-      VERSION = '0.0.68'
+      VERSION = '0.0.69'
     end
   end
 end

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: vmc_knife
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.69
 platform: ruby
 authors:
 - Intalio, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vmc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.18
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
@@ -83,7 +83,9 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
+- bin/vmc_knife
 - lib/restclient/restclient_add_timeout.rb
+- lib/vmc_knife.rb
 - lib/vmc_knife/cli_extensions.rb
 - lib/vmc_knife/commands/knife_cmds.rb
 - lib/vmc_knife/data_services.rb
@@ -92,8 +94,6 @@ files:
 - lib/vmc_knife/version.rb
 - lib/vmc_knife/vmc_helper.rb
 - lib/vmc_knife/vmc_knife.rb
-- lib/vmc_knife.rb
-- bin/vmc_knife
 homepage: http://intalio.com
 licenses: []
 metadata: {}
@@ -103,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Extensions for VMC the CLI of VMWare's Cloud Foundry