mobilize-ssh 1.299 → 1.351

data/README.md

@@ -169,9 +169,13 @@ The Git configuration consists of:
 
 Each domain has: 
 * a host;
-* a key (optional); If you don't need an ssh key to access the repo, remove that row from the configuration file.
-  * this is the relative path of the ssh key required to access the repository.
 * a user, which is the user used for the git clone command.
+* a set of repo keys (optional) which correspond to "deploy keys" on
+github.  Each repo must have its own ssh key, and the public key must be
+stored in the repo.
+  * if your repo doesn't need an ssh key to work, this is not necessary
+to add.
+
 
 Sample git.yml:
 
@@ -180,27 +184,33 @@ Sample git.yml:
 development:
   domains:
     private:
-      host: github.<domain>.com
-      key: config/mobilize/ssh_private.key
+      host: github.private.com
       user: git
+      repo_keys:
+        "repo_path_1": 'local/path/to/key1'
+        "repo_path_2": 'local/path/to/key1'
     public:
       host: github.com
       user: git
 test:
   domains:
-    private:
-      host: github.<domain>.com
-      key: config/mobilize/ssh_private.key
-      user: git
     public:
       host: github.com
       user: git
+    private:
+      host: github.private.com
+      user: git
+      repo_keys:
+        "repo_path_1": 'local/path/to/key1'
+        "repo_path_2": 'local/path/to/key1'
 production:
   domains:
     private:
-      host: github.<domain>.com
-      key: config/mobilize/ssh_private.key
+      host: github.private.com
       user: git
+      repo_keys:
+        "repo_path_1": 'local/path/to/key1'
+        "repo_path_2": 'local/path/to/key1'
     public:
       host: github.com
       user: git

data/lib/mobilize-ssh/handlers/git.rb

@@ -16,6 +16,14 @@ module Mobilize
       Git.domains.first
     end
 
+    def Git.repo_key(domain,repo)
+      begin
+        Git.config['domains'][domain]['repo_keys'][repo]
+      rescue
+        nil #no key for public repos
+      end
+    end
+
     # converts a source path or target path to a dst in the context of handler and stage
     def Git.path_to_dst(path,stage_path,gdrive_slot)
       red_path = path.split("://").last
@@ -74,7 +82,8 @@ module Mobilize
     #specified folder
     def Git.pull(domain,repo,revision,run_dir=Dir.mktmpdir)
       domain_properties = Git.config['domains'][domain]
-      user,host,key = ['user','host','key'].map{|k| domain_properties[k]}
+      user,host= ['user','host'].map{|k| domain_properties[k]}
+      key = Git.repo_key(domain,repo)
       #create folder for repo and command
       run_file_path = run_dir + "/cmd.sh"
       #put together command

data/lib/mobilize-ssh/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Ssh
-    VERSION = "1.299"
+    VERSION = "1.351"
   end
 end

data/lib/samples/git.yml

@@ -0,0 +1,34 @@
+---
+development:
+  domains:
+    private:
+      host: github.private.com
+      user: git
+      repo_keys:
+        "repo_path_1": 'local/path/to/key1'
+        "repo_path_2": 'local/path/to/key1'
+    public:
+      host: github.com
+      user: git
+test:
+  domains:
+    public:
+      host: github.com
+      user: git
+    private:
+      host: github.private.com
+      user: git
+      repo_keys:
+        "repo_path_1": 'local/path/to/key1'
+        "repo_path_2": 'local/path/to/key1'
+production:
+  domains:
+    private:
+      host: github.private.com
+      user: git
+      repo_keys:
+        "repo_path_1": 'local/path/to/key1'
+        "repo_path_2": 'local/path/to/key1'
+    public:
+      host: github.com
+      user: git

data/lib/samples/ssh.yml

@@ -1,6 +1,5 @@
 ---
 development:
-  tmp_file_dir: tmp/file/
   nodes:
     dev_node:
       sudoers: 
@@ -17,7 +16,6 @@ development:
         port: 22 
         user: gateway_user
 test:
-  tmp_file_dir: tmp/file/
   nodes:
     test_node:
       sudoers: 
@@ -34,7 +32,6 @@ test:
         port: 22 
         user: gateway_user
 production:
-  tmp_file_dir: tmp/file/
   nodes:
     prod_node:
       sudoers: 

data/mobilize-ssh.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_runtime_dependency "mobilize-base","1.298"
+  gem.add_runtime_dependency "mobilize-base","1.351"
   gem.add_runtime_dependency "net-ssh"
   gem.add_runtime_dependency "net-scp"
   gem.add_runtime_dependency "net-ssh-gateway"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-ssh
 version: !ruby/object:Gem::Version
-  version: '1.299'
+  version: '1.351'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mobilize-base
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.298'
+        version: '1.351'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.298'
+        version: '1.351'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - lib/mobilize-ssh/helpers/ssh_helper.rb
 - lib/mobilize-ssh/tasks.rb
 - lib/mobilize-ssh/version.rb
+- lib/samples/git.yml
 - lib/samples/ssh.yml
 - mobilize-ssh.gemspec
 - test/code.rb
@@ -119,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1792150884808390636
+      hash: -852942607763890721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1792150884808390636
+      hash: -852942607763890721
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25