rhc 0.94.8 → 0.95.13

data/spec/rest_spec_helper.rb

@@ -0,0 +1,86 @@
+require 'webmock/rspec'
+
+Spec::Matchers.define :have_same_attributes_as do |expected|
+  match do |actual|
+    (actual.instance_variables == expected.instance_variables) &&
+      (actual.instance_variables.map { |i| instance_variable_get(i) } ==
+       expected.instance_variables.map { |i| instance_variable_get(i) })
+  end
+end
+
+module RestSpecHelper
+  def mock_user
+    "test_user"
+  end
+
+  def mock_pass
+    "test pass"
+  end
+
+  def mock_uri
+    "test.domain.com"
+  end
+
+  # Creates consistent hrefs for testing
+  def mock_href(relative="", with_auth=false)
+    uri_string = mock_uri
+    if (with_auth == true)
+      uri_string = mock_user + ":" + mock_pass + "@" + mock_uri
+    end
+    "https://#{uri_string}/#{relative}"
+  end
+
+  # This formats link lists for JSONification
+  def mock_response_links(links)
+    link_set = {}
+    links.each do |link|
+      operation = link[0]
+      href      = link[1]
+      method    = link[2]
+      # Note that the 'relative' key/value pair below is a convenience for testing;
+      # this is not used by the API classes.
+      link_set[operation] = { 'href' => mock_href(href), 'method' => method, 'relative' => href }
+    end
+    return link_set
+  end
+
+  def mock_app_links(domain_id='test_domain',app_id='test_app')
+    [['ADD_CARTRIDGE',   "domains/#{domain_id}/apps/#{app_id}/carts/add", 'post'],
+     ['LIST_CARTRIDGES', "domains/#{domain_id}/apps/#{app_id}/carts/",    'get' ],
+     ['START',           "domains/#{domain_id}/apps/#{app_id}/start",     'post'],
+     ['STOP',            "domains/#{domain_id}/apps/#{app_id}/stop",      'post'],
+     ['RESTART',         "domains/#{domain_id}/apps/#{app_id}/restart",   'post'],
+     ['DELETE',          "domains/#{domain_id}/apps/#{app_id}/delete",    'post']]
+  end
+
+  def mock_cart_links(domain_id='test_domain',app_id='test_app',cart_id='test_cart')
+    [['START',   "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/start",   'post'],
+     ['STOP',    "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/stop",    'post'],
+     ['RESTART', "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/restart", 'post'],
+     ['DELETE',  "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/delete",  'post']]
+  end
+
+  def mock_client_links
+    [['GET_USER',        'user/',       'get' ],
+     ['ADD_DOMAIN',      'domains/add', 'post'],
+     ['LIST_DOMAINS',    'domains/',    'get' ],
+     ['LIST_CARTRIDGES', 'cartridges/', 'get' ]]
+  end
+
+  def mock_domain_links(domain_id='test_domain')
+    [['ADD_APPLICATION',   "domains/#{domain_id}/apps/add", 'post'],
+     ['LIST_APPLICATIONS', "domains/#{domain_id}/apps/",    'get' ],
+     ['UPDATE',            "domains/#{domain_id}/update",   'post'],
+     ['DELETE',            "domains/#{domain_id}/delete",   'post']]
+  end
+
+  def mock_key_links(key_id='test_key')
+    [['UPDATE', "user/keys/#{key_id}/update", 'post'],
+     ['DELETE', "user/keys/#{key_id}/delete", 'post']]
+  end
+
+  def mock_user_links
+    [['ADD_KEY',   'user/keys/add', 'post'],
+     ['LIST_KEYS', 'user/keys/',    'get' ]]
+  end
+end

data/spec/rhc/cli_spec.rb

@@ -2,6 +2,13 @@ require 'spec_helper'
 
 describe RHC::CLI do
 
+  shared_examples_for 'a help page' do
+    let(:arguments) { @arguments or raise "no arguments" }
+    it('should contain the program description') { run_output.should =~ /Command line interface for OpenShift/ }
+    it('should contain the global options') { run_output.should =~ /Global Options:/ }
+    it('should provide a --config switch') { run_output.should =~ /\-\-config FILE/ }
+  end
+
   describe '#start' do
     context 'with no arguments' do
       let(:arguments) { [] }
@@ -10,9 +17,18 @@ describe RHC::CLI do
     end
 
     context 'with --help' do
-      let(:arguments) { ['--help'] }
-      it { expect { run }.should exit_with_code(0) }
-      it('should contain the program description') { run_output.should =~ /Command line interface for OpenShift/ }
+      before(:each){ @arguments = ['--help'] }
+      it_should_behave_like 'a help page'
+    end
+    
+    context 'with -h' do
+      before(:each){ @arguments = ['-h'] }
+      it_should_behave_like 'a help page'
+    end
+
+    context 'with help' do
+      before(:each){ @arguments = ['help'] }
+      it_should_behave_like 'a help page'
     end
   end
 

data/spec/rhc/commands/server_spec.rb

@@ -4,7 +4,7 @@ require 'rhc/config'
 
 describe RHC::Commands::Server do
   before(:each) do
-    RHC::Config.initialize
+    RHC::Config.set_defaults
   end
 
   describe 'run' do
@@ -12,8 +12,8 @@ describe RHC::Commands::Server do
 
     context 'when no issues' do
       before { stub_request(:get, 'https://openshift.redhat.com/app/status/status.json').to_return(:body => {'issues' => []}.to_json) }
-      it { expect { run }.should exit_with_code(0) }
       it('should output success') { run_output.should =~ /All systems running fine/ }
+      it { expect { run }.should exit_with_code(0) }
     end
 
     context 'when 1 issue' do

data/spec/rhc/common_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc-common'
+
+# The existence of this file is a stopgap to provide test coverage
+# for a specific bug fix (BZ836882). This test should be migrated
+# to a more appropriate location when rhc-common is refactored out
+# of existence.
+
+describe RHC do
+  let(:client_links) { mock_response_links(mock_client_links) }
+  let(:domain_links) { mock_response_links(mock_domain_links('mock_domain')) }
+  let(:user_info) {
+    { 'user_info' => { 'domains' => [ { 'namespace' => 'mock_domain' } ] } }
+  }
+  context "#create_app" do
+    context " creating a scaling app" do
+      before do
+        stub_request(:get, mock_href('broker/rest/api', true)).
+          to_return({ :body   => { :data => client_links }.to_json,
+                      :status => 200
+                    })
+        stub_request(:any, mock_href(client_links['LIST_DOMAINS']['relative'], true)).
+          to_return({ :body   => {
+                        :type => 'domains',
+                        :data =>
+                        [{ :id    => 'mock_domain',
+                           :links => domain_links,
+                         }]
+                      }.to_json,
+                      :status => 200
+                    })
+        stub_request(:any, mock_href(domain_links['ADD_APPLICATION']['relative'], true)).
+          to_raise(Rhc::Rest::ServerErrorException.new("Mock server error"))
+        RHC.stub!(:print_response_err) { |output| @test_output = output; exit 1 }
+      end
+      it "posts an error message if the Rest API encounters a server error" do
+        lambda{ RHC.create_app( mock_uri, Net::HTTP, user_info,
+                                    'mock_app', 'mock_type', mock_user, mock_pass,
+                                    nil, false, false, false, 'small', true) }.
+          should raise_error(SystemExit)
+        @test_output.body.should match(/Mock server error/)
+      end
+      after do
+        RHC.unstub!(:print_response_err)
+      end
+    end
+  end
+end

data/spec/rhc/config_spec.rb

@@ -0,0 +1,328 @@
+require 'spec_helper'
+require 'rhc/config'
+require 'net/http'
+
+describe RHC::Config do
+  before(:all) do
+    ENV['LIBRA_SERVER'] = nil
+    ENV['http_proxy'] = nil
+    mock_terminal
+    FakeFS.activate!
+  end
+
+  after(:all) do
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
+
+  context "Config default values with no files" do
+    before(:each) do
+      RHC::Config.initialize
+    end
+
+    it "should not have any configs" do
+      RHC::Config.has_global_config?.should be_false
+      RHC::Config.has_local_config?.should be_false
+      RHC::Config.has_opts_config?.should be_false
+    end
+
+    it "should suggest I run the wizard" do
+      RHC::Config.should_run_wizard?.should be_true
+    end
+
+    it "should return openshift.redhat.com for the server" do
+      RHC::Config['libra_server'].should == "openshift.redhat.com"
+      RHC::Config.default_rhlogin.should be_nil
+      RHC::Config.config_user("default@redhat.com")
+      RHC::Config.default_rhlogin.should == "default@redhat.com"
+    end
+  end
+
+  context "Config values with /etc/openshift/express.conf" do
+    it "should have only a global config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com", "global@redhat.com")
+      RHC::Config.initialize
+      RHC::Config.has_global_config?.should be_true
+      RHC::Config.has_local_config?.should be_false
+      RHC::Config.has_opts_config?.should be_false
+    end
+
+    it "should get values from the global config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                     "global@redhat.com",
+                                                                     {"random_value" => 12})
+      RHC::Config.initialize
+
+      RHC::Config['libra_server'].should == "global.openshift.redhat.com"
+      RHC::Config.default_rhlogin.should == "global@redhat.com"
+      RHC::Config['random_value'].should == "12"
+      RHC::Config['non_value'].should be_nil
+
+    end
+
+    it "should have libra_server fallback to the default if not set in config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
+                                                                     "global@redhat.com")
+      RHC::Config.initialize
+
+      RHC::Config['libra_server'].should == "openshift.redhat.com"
+      RHC::Config.default_rhlogin.should == "global@redhat.com"
+    end
+  end
+
+  context "Config values with ~/.openshift/express.conf" do
+    it "should have global and local config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                     "global@redhat.com")
+      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                              "local.openshift.redhat.com","local@redhat.com")
+      RHC::Config.initialize
+      RHC::Config.home_dir = ConfigHelper.home_dir
+
+      RHC::Config.home_conf_path.should == File.join(ConfigHelper.home_dir, '.openshift')
+      RHC::Config.local_config_path.should == File.join(ConfigHelper.home_dir, '.openshift', 'express.conf')
+      RHC::Config.has_global_config?.should be_true
+      RHC::Config.has_local_config?.should be_true
+      RHC::Config.has_opts_config?.should be_false
+    end
+
+    it "should get values from local config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                     "global@redhat.com",
+                                                                     {"random_value" => "12"})
+      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                              "local.openshift.redhat.com",
+                                              "local@redhat.com",
+                                              {"random_value" => 11})
+      RHC::Config.initialize
+      RHC::Config.home_dir = ConfigHelper.home_dir
+
+      RHC::Config['libra_server'].should == "local.openshift.redhat.com"
+      RHC::Config.default_rhlogin.should == "local@redhat.com"
+      RHC::Config['random_value'].should == "11"
+      RHC::Config['non_value'].should be_nil
+    end
+
+    it "should fallback to the default or global if not set in config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
+                                                                     "global@redhat.com")
+      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                              nil,
+                                              nil,
+                                              {"random_value" => 11})
+      RHC::Config.initialize
+      RHC::Config.home_dir = ConfigHelper.home_dir
+
+      RHC::Config['libra_server'].should == "openshift.redhat.com"
+      RHC::Config.default_rhlogin.should == "global@redhat.com"
+      RHC::Config['random_value'].should == "11"
+    end
+
+  end
+
+  context "Config values with LIBRA_SERVER ENV set" do
+    it "should get values from local config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                     "global@redhat.com",
+                                                                     {"random_value" => "12"})
+      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                              "local.openshift.redhat.com",
+                                              "local@redhat.com",
+                                              {"random_value" => 11})
+      ENV['LIBRA_SERVER'] = "env.openshift.redhat.com"
+      RHC::Config.initialize
+      RHC::Config.set_local_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'))
+
+      RHC::Config['libra_server'].should == "env.openshift.redhat.com"
+      RHC::Config.default_rhlogin.should == "local@redhat.com"
+      RHC::Config['random_value'].should == "11"
+      RHC::Config['non_value'].should be_nil
+    end
+  end
+
+  context "Config values with options set" do
+    it "should have global and local config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                     "global@redhat.com")
+      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                              "local.openshift.redhat.com","local@redhat.com")
+      ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
+                                    "opts.openshift.redhat.com",
+                                    "opts@redhat.com")
+      RHC::Config.initialize
+      RHC::Config.home_dir = ConfigHelper.home_dir
+      RHC::Config.check_cpath({"config" => ConfigHelper.opts_config_path,
+                               "random_val" => "ok"})
+
+      RHC::Config.has_global_config?.should be_true
+      RHC::Config.has_local_config?.should be_true
+      RHC::Config.has_opts_config?.should be_true
+    end
+
+    it "should get values from local config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                     "global@redhat.com",
+                                                                     {"random_value" => "12"})
+      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                              "local.openshift.redhat.com",
+                                              "local@redhat.com",
+                                              {"random_value" => 11})
+      ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
+                                    "opts.openshift.redhat.com",
+                                    "opts@redhat.com",
+                                    {"random_value" => 10})
+      RHC::Config.initialize
+      RHC::Config.home_dir = ConfigHelper.home_dir
+      RHC::Config.check_cpath({"config" => ConfigHelper.opts_config_path,
+                               "random_val" => "ok"})
+
+      RHC::Config['libra_server'].should == "opts.openshift.redhat.com"
+      RHC::Config.default_rhlogin.should == "opts@redhat.com"
+      RHC::Config['random_value'].should == "10"
+      RHC::Config['non_value'].should be_nil
+    end
+
+    it "should fallback to the default or global or local if not set in config" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
+                                                                     "global@redhat.com")
+      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                              nil,
+                                              nil,
+                                              {"random_value" => 11,
+                                               "local_value" => "local"})
+      ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
+                                    nil,
+                                    nil,
+                                    {"random_value" => 10})
+      RHC::Config.initialize
+      RHC::Config.home_dir = ConfigHelper.home_dir
+      RHC::Config.check_cpath({"config" => ConfigHelper.opts_config_path,
+                               "random_val" => "ok"})
+
+      RHC::Config['libra_server'].should == "openshift.redhat.com"
+      RHC::Config.default_rhlogin.should == "global@redhat.com"
+      RHC::Config['random_value'].should == "10"
+      RHC::Config['local_value'].should == "local"
+    end
+  end
+
+  context "Debug options" do
+    after(:all) do
+      FakeFS::FileSystem.clear
+    end
+
+    it "should show debug as false because nothing is set" do
+      ConfigHelper.check_legacy_debug({}).should be_false
+    end
+
+    it "should show debug as 'true' because config is set" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path,
+                                    nil,
+                                    nil,
+                                    {"debug" => "true"})
+      RHC::Config.initialize
+      ConfigHelper.check_legacy_debug({}).should == "true"
+    end
+
+    it "should show debug as false because config is set" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path,
+                                    nil,
+                                    nil,
+                                    {"debug" => "false"})
+      RHC::Config.initialize
+      ConfigHelper.check_legacy_debug({}).should be_false
+    end
+
+    it "should show debug as true because config is set" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path,
+                                    nil,
+                                    nil,
+                                    {"debug" => "true"})
+      RHC::Config.initialize
+      ConfigHelper.check_legacy_debug({"debug" => false}).should be_true
+    end
+
+    it "should show debug as true because opt is set" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path,
+                                    nil,
+                                    nil,
+                                    {"debug" => "false"})
+      RHC::Config.initialize
+      ConfigHelper.check_legacy_debug({"debug" => true}).should be_true
+    end
+  end
+
+  context "Odds and ends including error conditions" do
+    it "should return a direct http connection" do
+      proxy = RHC::Config.default_proxy
+      proxy.should == Net::HTTP
+    end
+
+    it "should retrun a proxy http connection" do
+      RHC::Config.initialize
+      ENV['http_proxy'] = "fakeproxy.foo:8080"
+      proxy = RHC::Config.default_proxy
+      # returns a generic class so we check to make sure it is not a
+      # Net::HTTP class and rely on simplecov to make sure the proxy
+      # code path was run
+      proxy.should_not == Net::HTTP
+    end
+
+    it "should exit if config file can't be read" do
+      ConfigHelper.write_out_config(ConfigHelper.global_config_path,
+                                    "global.openshift.redhat.com",
+                                    "global@redhat.com")
+      RHC::Config.initialize
+      RHC::Vendor::ParseConfig.stub(:new) { raise Errno::EACCES.new("Fake can't read file") }
+      RHC::Config.stub(:exit) { |code| code }
+
+      RHC::Config.check_cpath({"config" => "fake.conf"}).should == 253
+
+      # write out config file so it exists but is not readable
+      ConfigHelper.write_out_config("fake.conf",
+                                    "global.openshift.redhat.com",
+                                    "global@redhat.com")
+
+      RHC::Config.read_config_files.should == 253
+      RHC::Config.set_local_config("fake.conf").should == 253
+      RHC::Config.set_opts_config("fake.conf").should == 253
+    end
+  end
+end
+
+class ConfigHelper
+  @@global_config_path = '/etc/openshift/express.conf'
+  @@home_dir = '/home/mock_user'
+  @@opts_config_path = File.join(@@home_dir, "my.conf")
+
+  def self.global_config_path
+    @@global_config_path
+  end
+
+  def self.home_dir
+    @@home_dir
+  end
+
+  def self.opts_config_path
+    @@opts_config_path
+  end
+
+  def self.check_legacy_debug(opts)
+    # this simulates how the old rhc code checked for debug
+    # in the future this should all be filtered through the Config module
+    # and an app should just have to use RHC::Config.debug?
+    debug = RHC::Config['debug'] == 'false' ? nil : RHC::Config['debug']
+    debug = true if opts.has_key? 'debug'
+    debug
+  end
+
+  def self.write_out_config(config_path, server, login, other={})
+    FileUtils.mkdir_p File.dirname(config_path)
+    File.open(config_path, "w") do |f|
+      f.write "# This is a test file\n\n"
+      f.write("libra_server = #{server}\n") unless server.nil?
+      f.write("default_rhlogin = #{login}\n\n") unless login.nil?
+      other.each { |key, value| f.write("#{key}=#{value}\n") }
+  end
+end
+end

data/spec/rhc/helpers_spec.rb

@@ -1,23 +1,70 @@
 require 'spec_helper'
 require 'rhc/helpers'
+require 'rhc/ssh_key_helpers'
 require 'rhc/core_ext'
 require 'highline/import'
 require 'rhc/config'
+require 'date'
 
 describe RHC::Helpers do
   before(:each) do
     mock_terminal
-    RHC::Config.initialize
+    RHC::Config.set_defaults
     @tests = HelperTests.new()
   end
 
   subject do 
     Class.new(Object) do
       include RHC::Helpers
+
+      def config
+        @config ||= RHC::Config
+      end
     end.new
   end
 
   its(:openshift_server) { should == 'openshift.redhat.com' }
+  its(:openshift_url) { should == 'https://openshift.redhat.com' }
+
+
+  it("should pluralize many") { subject.pluralize(3, 'fish').should == '3 fishs' }
+  it("should not pluralize one") { subject.pluralize(1, 'fish').should == '1 fish' }
+
+  it("should decode json"){ subject.decode_json("{\"a\" : 1}").should == {'a' => 1} }
+
+  it("should output green on success") do
+    capture{ subject.success 'this is green' }.should == "\e[32mthis is green\e[0m"
+  end
+  it("should output yellow on warn") do
+    capture{ subject.success 'this is yellow' }.should == "\e[32mthis is yellow\e[0m"
+  end
+  it("should return true on success"){ subject.success('anything').should be_true }
+  it("should return true on success"){ subject.warn('anything').should be_true }
+
+  it("should draw a table") do
+    subject.table([[10,2], [3,40]]) do |i|
+      i.map(&:to_s)
+    end.should == ['10 2','3  40']
+  end
+
+  it "should parse an RFC3339 date" do
+    d = subject.datetime_rfc3339('2012-06-24T20:48:20-04:00')
+    d.day.should == 24
+    d.month.should == 6
+    d.year.should == 2012
+  end
+
+  context 'using the current time' do
+    let(:now){ Time.now }
+    let(:rfc3339){ '%Y-%m-%dT%H:%M:%S%z' }
+    it("should output the time for a date that is today") do
+      subject.date(now.strftime(rfc3339)).should =~ /^[0-9]/
+    end
+    it("should output the year for a date that is not this year") do
+      older = now - 1*365*24*60
+      subject.date(older.strftime(rfc3339)).should =~ /^[A-Z]/
+    end
+  end
 
   context 'with LIBRA_SERVER environment variable' do
     before do
@@ -26,9 +73,18 @@ describe RHC::Helpers do
       RHC::Config.initialize
     end
     its(:openshift_server) { should == 'test.com' }
+    its(:openshift_url) { should == 'https://test.com' }
     after { ENV['LIBRA_SERVER'] = nil }
   end
 
+  context "without RHC::Config" do
+    subject do 
+      Class.new(Object){ include RHC::Helpers }.new
+    end
+
+    it("should raise on config"){ expect{ subject.config }.should raise_error }
+  end
+
   context "Formatter" do
     it "should print out a section without any line breaks" do
       @tests.section_no_breaks
@@ -82,8 +138,25 @@ describe RHC::Helpers do
     end
   end
 
+  context "SSH Key Helpers" do
+    before do
+      FakeFS.activate!
+    end
+
+    it "should generate an ssh key then return nil when it tries to create another" do
+      @tests.generate_ssh_key_ruby.should match("\.ssh/id_rsa\.pub")
+      @tests.generate_ssh_key_ruby == nil
+    end
+
+    after do
+      FakeFS::FileSystem.clear
+      FakeFS.deactivate!
+    end
+  end
+
   class HelperTests
     include RHC::Helpers
+    include RHC::SSHKeyHelpers
 
     def initialize
       @print_num = 0