rhc 1.19.5 → 1.20.3

data/README.md

@@ -7,8 +7,8 @@ info on installing the tool on each supported operating system.
 
 Please stop by #openshift on irc.freenode.net if you have any questions or
 comments.  For more information about OpenShift, visit https://openshift.redhat.com
-or the OpenShift forum
-https://openshift.redhat.com/community/forums/openshift.
+or the OpenShift support page
+https://openshift.redhat.com/support.
 
 
 ## Using RHC to create an application

data/features/keys_feature.rb

@@ -17,7 +17,7 @@ describe "rhc sshkey scenarios" do
         app = @domain.applications.first
         keyname = "key#{rand(1000000000000)}"
         keycontent = "principal#{rand(1000000000000)}"
-        
+
         r = rhc 'sshkey', 'add', keyname, '--type', 'krb5-principal', '--content', keycontent
         r.status.should == 0
 

data/lib/rhc/commands/cartridge.rb

@@ -52,18 +52,21 @@ module RHC::Commands
             say c.description
             paragraph{ say "Tagged with: #{tags.sort.join(', ')}" } if tags.present?
             paragraph{ say format_usage_message(c) } if c.usage_rate?
+            paragraph{ warn "Does not receive automatic security updates" } unless c.automatic_updates?
           end
         end
       else
         say table(carts.collect do |c|
-          [c.usage_rate? ? "#{c.name} (*)" : c.name,
+          [[c.name, c.usage_rate? ? " (*)" : "", c.automatic_updates? ? '' : ' (!)'].join(''),
            c.display_name,
-           c.only_in_existing? ? 'addon' : 'web']
+           c.only_in_existing? ? 'addon' : 'web',
+          ]
         end)
       end
 
       paragraph{ say "Note: Web cartridges can only be added to new applications." }
-      paragraph{ say "(*) denotes a cartridge with additional usage costs." } if carts.any? { |c| c.usage_rate? }
+      paragraph{ say "(*) denotes a cartridge with additional usage costs." } if carts.any?(&:usage_rate?)
+      paragraph{ say "(!) denotes a cartridge that will not receive automatic security updates." } unless options.verbose || carts.none?(&:automatic_updates?)
 
       0
     end

data/lib/rhc/commands/scp.rb

@@ -0,0 +1,54 @@
+require 'rhc/commands/base'
+require 'rhc/scp_helpers'
+
+
+module RHC::Commands
+  class Scp < Base
+    suppress_wizard
+
+    summary "SCP a file to or from your application"
+    description <<-DESC
+      Transfer files to and from your applications using SCP.  This will transfer
+      files to and from your primary gear (the one with the Git repository and web
+      cartridge) by default.
+
+      Examples:
+        Uploading a file from your workding directory to your app-root/data directory
+          rhc scp myapp upload somefile.txt app-root/data
+
+        Downloading a file from your app-root/data directory to your working directory
+          rhc scp myapp download ./ app-root/data/somebigarchive.tar.gz
+    DESC
+    syntax "[<app> --] <action> <local_path> <remote_path>"
+    takes_application :argument => true
+    argument :action, "Transfer direction: upload|download", ["-t", "--transfer_direction upload|download"], :optional => false
+    argument :local_path, "Local filesystem path", ["-l", "--local_path file_path"], :optional => false
+    argument :remote_path, "Remote filesystem path", ["-r", "--remote_path file_path"], :optional => false
+    alias_action 'app scp', :root_command => true
+    def run(_, action, local_path, remote_path)
+      rest_app = find_app
+      ssh_opts = rest_app.ssh_url.gsub("ssh://","").split("@")
+
+      raise RHC::ArgumentNotValid.new("'#{action}' is not a valid argument for this command.  Please use upload or download.") unless action == 'download' || action == 'upload'
+      raise RHC::FileOrPathNotFound.new("Local file, file_path, or directory could not be found.") unless File.exist?(local_path)
+
+      begin
+          start_time = Time.now
+          Net::SCP.send("#{action}!".to_sym, ssh_opts[1], ssh_opts[0], (action == 'upload' ? local_path : remote_path), (action == 'upload' ? remote_path : local_path)) do |ch, name, sent, total|
+            #:nocov:
+            $stderr.print "\r #{action}ing #{name}: #{((sent.to_f/total.to_f)*100).to_i}% complete. #{sent}/#{total} bytes transferred " + (sent == total ? "in #{Time.now - start_time} seconds \n" : "")
+            #:nocov:
+          end
+      rescue Errno::ECONNREFUSED
+        raise RHC::SSHConnectionRefused.new(ssh_opts[0], ssh_opts[1])
+      rescue SocketError => e
+        raise RHC::ConnectionFailed, "The connection to #{ssh_opts[1]} failed: #{e.message}"
+      rescue Net::SCP::Error => e
+        raise RHC::RemoteFileOrPathNotFound.new("Remote file, file_path, or directory could not be found.")
+      end
+    end
+
+    protected
+    include RHC::SCPHelpers
+  end
+end

data/lib/rhc/exceptions.rb

@@ -230,6 +230,24 @@ module RHC
     end
   end
 
+  class FileOrPathNotFound < Exception
+    def initialize(message="File, file path, or directory could not be found")
+      super message
+    end
+  end
+  
+  class RemoteFileOrPathNotFound < FileOrPathNotFound
+    def initialize(message="Remote File, file path, or directory could not be found")
+      super message
+    end
+  end
+
+  class ArgumentNotValid < Exception
+    def initialize(message="Argument is not valid for this command")
+      super message
+    end
+  end
+
   class NoDomainsForUser < Exception
     def initialize(message="In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'.")
       super message, 1

data/lib/rhc/rest/cartridge.rb

@@ -5,7 +5,7 @@ module RHC
 
       define_attr :type, :name, :display_name, :properties, :gear_profile, :status_messages, :scales_to, :scales_from, :scales_with,
                   :current_scale, :supported_scales_to, :supported_scales_from, :tags, :description, :collocated_with, :base_gear_storage,
-                  :additional_gear_storage, :url, :environment_variables, :gear_size
+                  :additional_gear_storage, :url, :environment_variables, :gear_size, :automatic_updates
 
       def scalable?
         supported_scales_to != supported_scales_from
@@ -23,6 +23,14 @@ module RHC
         type == 'embedded'
       end
 
+      def automatic_updates?
+        v = attribute(:automatic_updates)
+        if v.nil?
+          v = !(tags.include?('no_updates') || custom?)
+        end
+        v
+      end
+
       def shares_gears?
         Array(collocated_with).present?
       end

data/lib/rhc/rest/key.rb

@@ -30,7 +30,7 @@ module RHC
         @fingerprint ||= begin
           public_key = Net::SSH::KeyFactory.load_data_public_key("#{type} #{content}")
           public_key.fingerprint
-        rescue NotImplementedError, OpenSSL::PKey::PKeyError => e
+        rescue NotImplementedError, Net::SSH::Exception, OpenSSL::PKey::PKeyError
           'Invalid key'
         end if is_ssh?
       end

data/lib/rhc/rest/membership.rb

@@ -61,7 +61,7 @@ module RHC::Rest
     def compact_members
       arr = members.reject(&:owner?) rescue []
       if arr.length > 5
-        arr.sort_by!(&:name)
+        arr = arr.sort_by(&:name)
         admin, arr = arr.partition(&:admin?)
         edit, arr = arr.partition(&:editor?)
         view, arr = arr.partition(&:viewer?)
@@ -97,7 +97,7 @@ module RHC::Rest
     end
 
     def owner
-      if o = Array(attribute(:members)).find{ |m| m['owner'] == true }
+      if o = Array(attributes['members']).find{ |m| m['owner'] == true }
         o['name'] || o['login']
       end
     end

data/lib/rhc/rest/mock.rb

@@ -697,6 +697,7 @@ module RHC::Rest::Mock
 
     def add_member(member)
       (@members ||= []) << member
+      (attributes['members'] ||= []) << member.attributes
       self
     end
   end
@@ -902,6 +903,7 @@ module RHC::Rest::Mock
 
     def add_member(member)
       (@members ||= []) << member
+      (attributes['members'] ||= []) << member.attributes
       self
     end
 

data/lib/rhc/scp_helpers.rb

@@ -0,0 +1,27 @@
+###
+# ssh_key_helpers.rb - methods to help manipulate ssh keys
+#
+# Copyright 2012 Red Hat, Inc. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+#  limitations under the License.
+
+require 'net/ssh'
+require 'net/scp'
+require 'rhc/ssh_helpers'
+require 'rhc/vendor/sshkey'
+
+module RHC
+  module SCPHelpers
+    include SSHHelpers
+  end
+end

data/lib/rhc/ssh_helpers.rb

@@ -169,7 +169,9 @@ module RHC
     def ssh_ruby(host, username, command, compression=false, request_pty=false, &block)
       debug "Opening Net::SSH connection to #{host}, #{username}, #{command}"
       exit_status = 0
-      Net::SSH.start(host, username, :compression => compression) do |session|
+      options = {:compression => compression}
+      options[:verbose] = :debug if debug?
+      Net::SSH.start(host, username, options) do |session|
         #:nocov:
         channel = session.open_channel do |channel|
           if request_pty

data/spec/rhc/commands/domain_spec.rb

@@ -385,7 +385,7 @@ describe RHC::Commands::Domain do
         rest_client.domains.empty?.should be_true
       end
     end
-    
+
   end
 
   describe 'help' do

data/spec/rhc/commands/member_spec.rb

@@ -37,8 +37,27 @@ describe RHC::Commands::Member do
 
   let(:owner){ RHC::Rest::Membership::Member.new(:id => '1', :role => 'admin', :owner => true, :login => 'alice') }
   let(:other_admin){ RHC::Rest::Membership::Member.new(:id => '2', :role => 'admin', :login => 'Bob') }
-  let(:other_editor){ RHC::Rest::Membership::Member.new(:id => '3', :role => 'editor', :name => 'Carol', :login => 'carol') }
-  let(:other_viewer){ RHC::Rest::Membership::Member.new(:id => '4', :role => 'viewer', :name => 'Doug', :login => 'doug@doug.com') }
+  let(:other_editor){ RHC::Rest::Membership::Member.new(:id => '3', :role => 'edit', :name => 'Carol', :login => 'carol') }
+  let(:other_viewer){ RHC::Rest::Membership::Member.new(:id => '4', :role => 'view', :name => 'Doug', :login => 'doug@doug.com') }
+  let(:other_viewer2){ RHC::Rest::Membership::Member.new(:id => '5', :role => 'view', :name => 'ViewerC', :login => 'viewerc@viewer.com') }
+  let(:other_viewer3){ RHC::Rest::Membership::Member.new(:id => '6', :role => 'view', :name => 'ViewerB', :login => 'viewerb@viewer.com') }
+  let(:other_viewer4){ RHC::Rest::Membership::Member.new(:id => '7', :role => 'view', :name => 'ViewerA', :login => 'viewera@viewer.com') }
+
+  describe 'show-domain' do
+    context 'with members' do
+      let(:arguments) { ['domain', 'show', 'mock-domain-0'] }
+      let(:supports_members){ true }
+
+      before{ with_mock_domain.add_member(owner).add_member(other_editor).add_member(other_admin).add_member(other_viewer).add_member(other_viewer2).add_member(other_viewer3).add_member(other_viewer4) }
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should =~ /owned by alice/ }
+      it { run_output.should =~ /Bob\s+\(admin\)/ }
+      it { run_output.should =~ /<carol>\s+\(edit\)/ }
+      it { run_output.should =~ /<doug@doug\.com>\s+\(view\)/ }
+      it("should order the members by role then by name") { run_output.should =~ /Bob.*admin.*Admins.*Carol.*Editors.*ViewerA.*ViewerB.*ViewerC.*Viewers/m }
+      it("should include the login value") { run_output.should =~ /alice.*Bob.*carol.*doug@doug\.com/m }
+    end
+  end
 
   describe 'list-member' do
     context 'on a domain' do
@@ -79,8 +98,8 @@ describe RHC::Commands::Member do
         it { expect { run }.to exit_with_code(0) }
         it { run_output.should =~ /alice\s+admin \(owner\)/ }
         it { run_output.should =~ /Bob\s+admin/ }
-        it { run_output.should =~ /carol\s+editor/ }
-        it { run_output.should =~ /doug\.com\s+viewer/ }
+        it { run_output.should =~ /carol\s+edit/ }
+        it { run_output.should =~ /doug\.com\s+view/ }
         it("should order the members by role") { run_output.should =~ /admin.*owner.*admin.*edit.*view/m }
         it("should include the login value") { run_output.should =~ /alice.*Bob.*carol.*doug@doug\.com/m }
         it("should show the name column") { run_output.should =~ /^Name\s+Login\s+Role$/ }

data/spec/rhc/commands/scp_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/scp'
+
+describe RHC::Commands::Scp do
+  let!(:rest_client){ MockRestClient.new }
+  let!(:config){ user_config }
+  before{ RHC::Config.stub(:home_dir).and_return('/home/mock_user') }
+  before{ Kernel.stub(:exec).and_raise(RuntimeError) }
+
+  describe 'scp default' do
+    context 'scp' do
+      let(:arguments) { ['scp'] }
+      it { run_output.should match('Usage:') }
+    end
+  end
+
+  describe 'scp with invalid option' do
+    let (:arguments) {['app', 'scp', 'app1', 'invalid_command', 'file.txt', 'app-root/data']}
+
+    context 'when run' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+      end
+      it { run_output.should match("'invalid_command' is not a valid argument for this command.  Please use upload or download.") }
+    end
+  end
+
+  describe 'local file or path does not exist' do
+    let (:arguments) {['app', 'scp', 'app1', 'upload', 'file.txt', 'app-root/data']}
+
+    context 'when run' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        File.should_receive(:exist?).with("file.txt").once.and_return(false)
+      end
+      it { run_output.should match("Local file, file_path, or directory could not be found.") }
+    end
+  end
+
+  describe 'scp connections' do
+    let (:arguments) {['app', 'scp', 'app1', 'upload', 'file.txt', 'app-root/data']}
+
+    context 'connection refused' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Errno::ECONNREFUSED)
+      end
+      it { run_output.should match("The server fakeuuidfortestsapp1 refused a connection with user 127.0.0.1.  The application may be unavailable.") }
+    end
+
+    context 'socket error' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(SocketError)
+      end
+      it { run_output.should match("The connection to 127.0.0.1 failed: SocketError") }
+    end
+
+    context 'remote file not found' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Net::SCP::Error)
+      end
+      it { run_output.should match("Remote file, file_path, or directory could not be found.") }
+    end
+  end
+
+end

data/spec/rhc/commands/sshkey_spec.rb

@@ -14,13 +14,13 @@ describe RHC::Commands::Sshkey do
       let(:arguments) { %w[sshkey list --noprompt --config test.conf -l test@test.foo -p  password --trace] }
 
       it { expect { run }.to exit_with_code(0) }
-      
+
       it { run_output.should match(/mockkey1 \(type: ssh-rsa\)/) }
       it { run_output.should match(/Fingerprint:.*0f:ce:86:80:df:a0:81:ca:db:f1:a7:0c:70:85:ce:00/) }
-      
+
       it { run_output.should match(/mockkey3 \(type: krb5-principal\)/) }
       it { run_output.should match(/Principal:.* mockuser@mockdomain/) }
-      it { run_output.should_not match(/Fingerprint:.*Invalid key/) }
+      # it { run_output.should match(/Fingerprint:.*Invalid key/) }
     end
   end
 
@@ -127,25 +127,25 @@ describe RHC::Commands::Sshkey do
 
     context "when adding a nonexistent key" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
-    
+
       it "exits with status code Errno::ENOENT::Errno" do
         expect { run }.to exit_with_code(128)
       end
     end
-    
+
     context "when attempting to add an existing but inaccessible key" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar inaccessible_key.pub] }
-      
+
       #before :all do
       #  @inaccessible_key = 'inaccessible_key.pub'
       #  File.new(@inaccessible_key, 'w+')
       #  File.chmod(0000, @inaccessible_key)
       #end
-      
+
       #after :all do
       #  File.delete @inaccessible_key
       #end
-    
+
       it "exits with status code Errno::EACCES::Errno" do
         IO.should_receive(:read).and_raise(Errno::EACCES)
         expect { run }.to exit_with_code(128)
@@ -155,7 +155,7 @@ describe RHC::Commands::Sshkey do
 
     context "when adding a key without correct arguments" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar] }
-  
+
       it "exits with argument error" do
         expect { run }.to exit_with_code(1)
       end

data/spec/rhc/helpers_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'rhc'
 require 'rhc/ssh_helpers'
+require 'rhc/scp_helpers'
 require 'rhc/cartridge_helpers'
 require 'rhc/git_helpers'
 require 'rhc/core_ext'
@@ -13,6 +14,7 @@ require 'ostruct'
 class AllRhcHelpers
   include RHC::Helpers
   include RHC::SSHHelpers
+  include RHC::SCPHelpers
   include RHC::CartridgeHelpers
 
   def config

data/spec/rhc/highline_extensions_spec.rb

@@ -23,7 +23,7 @@ class OutputTests < SimpleDelegator
   def output_no_breaks
     say "section #{next_print_num} "
   end
-  
+
   def section_same_line
     section { output_no_breaks; say 'word' }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 65
   prerelease: 
   segments: 
   - 1
-  - 19
-  - 5
-  version: 1.19.5
+  - 20
+  - 3
+  version: 1.20.3
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-28 00:00:00 Z
+date: 2014-02-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -34,9 +34,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-multi
+  name: net-scp
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-ssh-multi
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +64,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,11 +78,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: commander
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +93,11 @@ dependencies:
         - 0
         version: "4.0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,11 +109,11 @@ dependencies:
         - 11
         version: 1.6.11
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: httpclient
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,11 +124,11 @@ dependencies:
         - 2
         version: "2.2"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,11 +138,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -138,11 +154,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -153,11 +169,11 @@ dependencies:
         - 12
         version: "1.12"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -169,11 +185,11 @@ dependencies:
         - 0
         version: 2.8.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: fakefs
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -184,11 +200,11 @@ dependencies:
         - 4
         version: "0.4"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -198,11 +214,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -212,11 +228,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -227,7 +243,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 description: The client tools for the OpenShift platform that allow for application management.
 email: dev@lists.openshift.redhat.com
 executables: 
@@ -243,6 +259,7 @@ files:
 - lib/rhc/core_ext.rb
 - lib/rhc/json.rb
 - lib/rhc/wizard.rb
+- lib/rhc/scp_helpers.rb
 - lib/rhc/rest.rb
 - lib/rhc/autocomplete.rb
 - lib/rhc/git_helpers.rb
@@ -258,6 +275,7 @@ files:
 - lib/rhc/commands/setup.rb
 - lib/rhc/commands/deployment.rb
 - lib/rhc/commands/tail.rb
+- lib/rhc/commands/scp.rb
 - lib/rhc/commands/server.rb
 - lib/rhc/commands/ssh.rb
 - lib/rhc/commands/apps.rb
@@ -344,6 +362,7 @@ files:
 - spec/rhc/commands/tail_spec.rb
 - spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/scp_spec.rb
 - spec/rhc/commands/env_spec.rb
 - spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/git_clone_spec.rb
@@ -438,6 +457,7 @@ test_files:
 - spec/rhc/commands/tail_spec.rb
 - spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/scp_spec.rb
 - spec/rhc/commands/env_spec.rb
 - spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/git_clone_spec.rb