rhc 0.92.11 → 0.93.18

data/spec/rhc/assets/foo.txt

@@ -0,0 +1 @@
+foo

data/spec/rhc/assets/targz_corrupted.tar.gz

@@ -0,0 +1 @@
+foo

data/spec/rhc/cli_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe RHC::CLI do
+
+  describe '#start' do
+    context 'with no arguments' do
+      let(:arguments) { [] }
+      it { expect { run }.should exit_with_code(1) }
+      it('should provide a message about --help') { run_output.should =~ /\-\-help/ }
+    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/ }
+    end
+  end
+
+  describe '#set_terminal' do
+    before(:each) { mock_terminal }
+    it('should update $terminal.wrap_at') { expect { RHC::CLI.set_terminal }.to change($terminal, :wrap_at) }
+  end
+
+end

data/spec/rhc/command_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'rhc/commands/base'
+
+describe RHC::Commands::Base do
+
+  describe '#object_name' do
+    subject { described_class }
+    its(:object_name) { should == 'base' }
+
+    context 'when the class is at the root' do
+      subject do 
+        Kernel.module_eval do 
+          class StaticRootClass < RHC::Commands::Base; def run; 1; end; end
+        end
+        StaticRootClass
+      end
+      its(:object_name) { should == 'staticrootclass' }
+    end
+    context 'when the class is nested in a module' do
+      subject do 
+        Kernel.module_eval do 
+          module Nested; class StaticRootClass < RHC::Commands::Base; def run; 1; end; end; end
+        end
+        Nested::StaticRootClass
+      end
+      its(:object_name) { should == 'staticrootclass' }
+    end
+  end
+
+  describe '#inherited' do
+
+    let(:instance) { subject.new }
+    let(:commands) { RHC::Commands.send(:commands) }
+
+    context 'when dynamically instantiating without an object name' do
+      subject { const_for(Class.new(RHC::Commands::Base) { def run; 1; end }) }
+      
+      it("should raise") { expect { subject }.to raise_exception( RHC::Commands::Base::InvalidCommand, /object_name/i ) }
+    end
+
+    context 'when dynamically instantiating with object_name' do
+      subject { const_for(Class.new(RHC::Commands::Base) { object_name :test; def run(args, options); 1; end }) }
+      
+      it("should register itself") { expect { subject }.to change(commands, :length).by(1) }
+      it("should have an object name") { subject.object_name.should == 'test' }
+      it { expects_running('test').should call(:run).on(instance).with(no_args) }
+    end
+
+    context 'when statically defined' do
+      subject do 
+        Kernel.module_eval do 
+          module Nested
+            class Static < RHC::Commands::Base
+              def run(args, options); 1; end
+            end
+          end
+        end
+        Nested::Static
+      end
+      
+      it("should register itself") { expect { subject }.to change(commands, :length).by(1) }
+      it("should have an object name of the class") { subject.object_name.should == 'static' }
+      it("invokes the right method") { expects_running('static').should call(:run).on(instance).with(no_args) }
+    end
+
+    context 'when statically defined with no default method' do
+      subject do 
+        Kernel.module_eval do 
+          class Static < RHC::Commands::Base
+            def test; 1; end
+            def execute; 1; end
+          end
+        end
+        Static
+      end
+      
+      it("should register itself") { expect { subject }.to change(commands, :length).by(2) }
+      it("should have an object name of the class") { subject.object_name.should == 'static' }
+      
+      context 'and when test is called' do
+        it { expects_running('static', 'test').should call(:test).on(instance).with(no_args) }
+      end
+      context 'and when test is called' do
+        it { expects_running('static', 'execute').should call(:execute).on(instance).with(no_args) }
+      end
+    end
+  end
+end

data/spec/rhc/commands/server_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'rhc/commands/server'
+require 'rhc/config'
+
+describe RHC::Commands::Server do
+  before(:each) do
+    RHC::Config.initialize
+  end
+
+  describe 'run' do
+    let(:arguments) { ['server'] }
+
+    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/ }
+    end
+
+    context 'when 1 issue' do
+      before do 
+        stub_request(:get, 'https://openshift.redhat.com/app/status/status.json').to_return(:body => 
+          {'open' => [
+            {'issue' => { 
+              'created_at' => '2011-05-22T17:31:32-04:00', 
+              'id' => 11, 
+              'title' => 'Root cause', 
+              'updates' => [{
+                'created_at' => '2012-05-22T13:48:20-04:00', 
+                'description' => 'Working on update'
+              }] 
+            }}]}.to_json)
+      end
+      it { expect { run }.should exit_with_code(1) }
+      it('should output message') { run_output.should =~ /1 open issue/ }
+      it('should output title') { run_output.should =~ /Root cause/ }
+      it('should contain update') { run_output.should =~ /Working on update/ }
+    end
+  end
+end

data/spec/rhc/helpers_spec.rb

@@ -0,0 +1,171 @@
+require 'spec_helper'
+require 'rhc/helpers'
+require 'rhc/core_ext'
+require 'highline/import'
+require 'rhc/config'
+
+describe RHC::Helpers do
+  before(:each) do
+    mock_terminal
+    RHC::Config.initialize
+    @tests = HelperTests.new()
+  end
+
+  subject do 
+    Class.new(Object) do
+      include RHC::Helpers
+    end.new
+  end
+
+  its(:openshift_server) { should == 'openshift.redhat.com' }
+
+  context 'with LIBRA_SERVER environment variable' do
+    before do
+      ENV['LIBRA_SERVER'] = 'test.com'
+      # need to reinit config to pick up env var
+      RHC::Config.initialize
+    end
+    its(:openshift_server) { should == 'test.com' }
+    after { ENV['LIBRA_SERVER'] = nil }
+  end
+
+  context "Formatter" do
+    it "should print out a section without any line breaks" do
+      @tests.section_no_breaks
+      $terminal.read.should == "section 1 "
+    end
+
+    it "should print out a section with trailing line break" do
+      @tests.section_one_break
+      $terminal.read.should == "section 1\n"
+    end
+
+    it "should print out 2 sections with matching bottom and top margins generating one space between" do
+      @tests.sections_equal_bottom_top
+      $terminal.read.should == "section 1\n\nsection 2\n"
+    end
+
+    it "should print out 2 sections with larger bottom margin generating two spaces between" do
+      @tests.sections_larger_bottom
+      $terminal.read.should == "section 1\n\n\nsection 2\n"
+    end
+
+    it "should print out 2 sections with larger top margin generating two spaces between" do
+      @tests.sections_larger_top
+      $terminal.read.should == "section 1\n\n\nsection 2\n"
+    end
+
+    it "should print out 4 sections with the middle two on the same line and a space between the lines" do
+      @tests.sections_four_on_three_lines
+      $terminal.read.should == "section 1\n\nsection 2 section 3\n\nsection 4\n"
+    end
+
+    it "should show the equivilance of paragaph to section(:top => 1, :bottom => 1)" do
+      @tests.section_1_1
+      section_1_1 = $terminal.read
+      @tests.reset
+      @tests.section_paragraph
+      paragraph = $terminal.read
+
+      section_1_1.should == paragraph
+
+      @tests.reset
+      @tests.section_1_1
+      @tests.section_paragraph
+
+      $terminal.read.should == "\nsection\n\nsection\n\n"
+    end
+
+    it "should show two line with one space between even though an outside newline was printed" do
+      @tests.outside_newline
+      $terminal.read.should == "section 1\n\nsection 2\n"
+    end
+  end
+
+  class HelperTests
+    include RHC::Helpers
+
+    def initialize
+      @print_num = 0
+    end
+
+    def next_print_num
+      @print_num += 1
+    end
+
+    def output
+      say "section #{next_print_num}"
+    end
+
+    def output_no_breaks
+      say "section #{next_print_num} "
+    end
+
+    def section_no_breaks
+      section { output_no_breaks }
+    end
+
+    def section_one_break
+      section { output }
+    end
+
+    def sections_equal_bottom_top
+      section(:bottom => 1) { output }
+      section(:top => 1) { output }
+    end
+
+    def sections_larger_bottom
+      section(:bottom => 2) { output }
+      section(:top => 1) { output }
+    end
+
+    def sections_larger_top
+      section(:bottom => 1) { output }
+      section(:top => 2) { output }
+    end
+
+    def sections_four_on_three_lines
+      section { output }
+      section(:top => 1) { output_no_breaks }
+      section(:bottom => 1) { output }
+      section(:top => 1) { output }
+    end
+
+    def outside_newline
+      section(:bottom => -1) { output }
+      say "\n"
+      section(:top => 1) { output }
+    end
+
+    def section_1_1
+      section(:top => 1, :bottom => 1) { say "section" }
+    end
+
+    def section_paragraph
+      paragraph { say "section" }
+    end
+
+    # call section without output to reset spacing to 0
+    def reset
+      section {}
+    end
+  end
+end
+
+describe Object do
+  context 'present?' do
+    specify('nil') { nil.present?.should be_false }
+    specify('empty array') { [].present?.should be_false }
+    specify('array') { [1].present?.should be_true }
+    specify('string') { 'a'.present?.should be_true }
+    specify('empty string') { ''.present?.should be_false }
+  end
+
+  context 'blank?' do
+    specify('nil') { nil.blank?.should be_true }
+    specify('empty array') { [].blank?.should be_true }
+    specify('array') { [1].blank?.should be_false }
+    specify('string') { 'a'.blank?.should be_false }
+    specify('empty string') { ''.blank?.should be_true }
+  end
+end

data/spec/rhc/json_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'rhc/json'
+
+describe RHC::Json do
+
+  context 'with simple decoded hash as a string' do
+    subject { RHC::Json.decode '{"abc":[123,-456.789e0],"def":[456,-456.789e0],"ghi":"ghj"}' }
+    its(:length) { should == 3 }
+    it('should contain key') { subject.has_key?("abc").should be_true  }
+    it('should contain key') { subject.has_key?("def").should be_true  }
+    it('should contain key') { subject.has_key?("ghi").should be_true  }
+    it('should not contain invalid key') { subject.has_key?("ghj").should be_false  }
+    it('should contain value for key') { subject.has_value?("ghj").should be_true  }
+    it('should contain array value') { subject["abc"].is_a?(Array).should be_true  }
+    it('should contain array with two elements') { subject["abc"].length.should == 2  }
+    it('should contain array with an integer') { subject["abc"][0].should == 123  }
+    it('should contain array with a float') { subject["abc"][1].should == -456.789e0 }
+  end
+
+  context 'with simple hash' do
+    subject { RHC::Json.encode({"key" => "value"}) }
+    it('should encode to proper json') { subject.should == '{"key":"value"}'  }
+    it('should encode and decode to the same hash') { RHC::Json.decode(subject).should == {"key" => "value"} }
+    it('should decode and encode to the same string') { RHC::Json.encode(RHC::Json.decode('{"x":"y"}')).should == '{"x":"y"}' }
+    it('should decode symbol keys') { RHC::Json.decode('{"key":"ok"}', {:symbolize_keys => true}).has_key?(:key).should be_true }
+    it('should decode symbol keys') { RHC::Json.decode('{"key":"ok"}', {:symbolize_keys => true})[:key].should == "ok" }
+    it('should encode symbol keys') { RHC::Json.encode({:key => "ok"}).should == '{"key":"ok"}' }
+  end
+
+end

data/spec/rhc/targz_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'rhc/targz'
+
+describe RHC::TarGz do
+
+  context 'with simple compressed .tar.gz' do
+    subject { File.expand_path('../assets/targz_sample.tar.gz', __FILE__) }
+    it('should wrap the right filename') { File.basename(subject).should ==  'targz_sample.tar.gz' }
+    it('should contain the right files') { RHC::TarGz.contains(subject, 'foo').should be_true }
+    it('should contain the right files') { RHC::TarGz.contains(subject, 'bar').should be_false }
+    it('should contain the right files') { RHC::TarGz.contains(subject, 'test').should be_false }
+    it('should contain the right files') { RHC::TarGz.contains(subject, 'foo').should be_true }
+    it('should contain the right files') { RHC::TarGz.contains(subject, 'bar').should be_false }
+    it('should contain the right files') { RHC::TarGz.contains(subject, 'test').should be_false }
+  end
+
+  context 'with file extension different than .tar.gz' do
+    subject { File.expand_path('../assets/foo.txt', __FILE__) }
+    it('should never return contains') { RHC::TarGz.contains(subject, 'foo').should be_false }
+    it('should never return contains') { RHC::TarGz.contains(subject, 'foo', true).should be_false }
+  end
+
+  context 'with corrupted .tar.gz' do
+    subject { File.expand_path('../assets/targz_corrupted.tar.gz', __FILE__) }
+    it('should never return contains') { RHC::TarGz.contains(subject, 'foo').should be_false }
+    it('should never return contains') { RHC::TarGz.contains(subject, 'foo', true).should be_false }
+  end
+
+  context 'with multiple threads' do
+    subject { File.expand_path('../assets/targz_sample.tar.gz', __FILE__) }
+    it('should be able to handle the same file') {
+      threads = []
+      30.times {
+        threads << Thread.new { Thread.current['result'] = RHC::TarGz.contains(subject, 'foo') }
+        threads << Thread.new { Thread.current['result'] = RHC::TarGz.contains(subject, 'foo', true) }
+      }
+      threads.each { |thread| thread.join }
+      threads.each { |thread| thread['result'].should be_true }
+    }
+  end
+
+end

data/spec/rhc/wizard_spec.rb

@@ -0,0 +1,426 @@
+require 'spec_helper'
+require 'fakefs/safe'
+require 'rhc/wizard'
+require 'parseconfig'
+require 'rhc/config'
+
+# monkey patch ParseConfig so it works with fakefs
+# TODO: if this is useful elsewhere move to helpers
+class ParseConfig
+  def open(*args)
+    File.open *args
+  end
+end
+
+# chmod isn't implemented in the released fakefs gem
+# but is in git.  Once the git version is released we
+# should remove this and actively check permissions
+class FakeFS::File
+  def self.chmod(*args)
+    # noop
+  end
+end
+
+describe RHC::Wizard do
+  before(:all) do
+    mock_terminal
+    FakeFS.activate!
+  end
+
+  after(:all) do
+    FakeFS.deactivate!
+  end
+
+  context "First run of rhc" do
+    before(:all) do
+      @wizard = FirstRunWizardDriver.new
+    end
+
+    it "should print out first run greeting" do
+      @wizard.run_next_stage
+      greeting = $terminal.read
+      greeting.count("\n").should == 8
+      greeting.should match(Regexp.escape("It looks like you have not configured or used OpenShift client tools on this computer."))
+      greeting.should match(Regexp.escape("\n#{@wizard.config_path}\n"))
+    end
+
+    it "should ask for login and hide password input" do
+      # queue up input
+      $terminal.write_line "#{@wizard.mock_user}"
+      $terminal.write_line "password"
+
+      @wizard.stub_user_info
+      @wizard.stub_rest_api
+
+      @wizard.run_next_stage
+
+      output = $terminal.read
+      output.should match("OpenShift login")
+      output.should =~ /(#{Regexp.escape("Password: ********\n")})$/
+    end
+
+    it "should write out a config" do
+      File.exists?(@wizard.config_path).should be false
+      @wizard.run_next_stage
+      File.readable?(@wizard.config_path).should be true
+      cp = ParseConfig.new @wizard.config_path
+      cp.get_value("default_rhlogin").should == @wizard.mock_user
+      cp.get_value("libra_server").should == @wizard.libra_server
+    end
+
+    it "should write out generated ssh keys" do
+      @wizard.setup_mock_ssh
+      private_key_file = File.join(@wizard.ssh_dir, "id_rsa")
+      public_key_file = File.join(@wizard.ssh_dir, "id_rsa.pub")
+      File.exists?(private_key_file).should be false
+      File.exists?(public_key_file).should be false
+      @wizard.run_next_stage
+      File.exists?(private_key_file).should be true
+      File.exists?(public_key_file).should be true
+    end
+
+    it "should upload ssh keys" do
+      @wizard.stub_ssh_keys
+      # don't upload
+      $terminal.write_line('no')
+      @wizard.run_next_stage
+    end
+
+    it "should check for client tools" do
+
+    end
+
+    it "should ask for a namespace" do
+
+    end
+
+    it "should show app creation commands" do
+
+    end
+
+    it "should show a thank you message" do
+
+    end
+  end
+
+  context "Repeat run of rhc setup without anything set" do
+
+
+    it "should print out repeat run greeting" do
+
+    end
+
+    it "should ask for login and hide password input" do
+
+    end
+
+    it "should write out a config" do
+
+    end
+
+    it "should write out generated ssh keys" do
+
+    end
+
+    it "should upload ssh key as default" do
+
+    end
+
+    it "should check for client tools and print they need to be installed" do
+
+    end
+
+    it "should ask for a namespace" do
+
+    end
+
+    it "should show app creation commands" do
+
+    end
+
+    it "should show a thank you message" do
+
+    end
+  end
+
+  context "Repeat run of rhc setup with config set" do
+
+    it "should print out repeat run greeting" do
+
+    end
+
+    it "should ask for password input (no login)" do
+
+    end
+
+    it "should write out generated ssh keys" do
+
+    end
+
+    it "should find out that you do not have not uploaded the keys and ask to name the key" do
+
+    end
+
+    it "should check for client tools and find them" do
+
+    end
+
+    it "should ask for a namespace" do
+
+    end
+
+    it "should show app creation commands" do
+
+    end
+
+    it "should show a thank you message" do
+
+    end
+  end
+
+  context "Repeat run of rhc setup with config and ssh keys set" do
+
+    it "should print out repeat run greeting" do
+
+    end
+
+    it "should ask for password input (no login)" do
+
+    end
+
+    it "should check for ssh tools and find a match" do
+
+    end
+
+    it "should check for client tools and find them" do
+
+    end
+
+    it "should ask for a namespace" do
+
+    end
+
+    it "should show app creation commands" do
+
+    end
+
+    it "should show a thank you message" do
+
+    end
+  end
+
+  context "Repeat run of rhc setup with everything set" do
+
+    it "should print out repeat run greeting" do
+
+    end
+
+    it "should ask password input (not login)" do
+
+    end
+
+    it "should check for ssh keys and find they are uploaded" do
+
+    end
+
+    it "should check for client tools and find them" do
+
+    end
+
+    it "should show namespace" do
+
+    end
+
+    it "should list apps" do
+
+    end
+
+    it "should show a thank you message" do
+
+    end
+  end
+
+  context "Repeat run of rhc setup with everything set but platform set to Windows" do
+
+    it "should print out repeat run greeting" do
+
+    end
+
+    it "should ask password input (not login)" do
+
+    end
+
+    it "should check for ssh keys and find they are uploaded" do
+
+    end
+
+    it "should print out windows client tool info" do
+
+    end
+
+    it "should show namespace" do
+
+    end
+
+    it "should list apps" do
+
+    end
+
+    it "should show a thank you message" do
+
+    end
+  end
+
+  module WizardDriver
+    attr_accessor :mock_user, :libra_server, :config_path, :ssh_dir
+    def initialize
+      RHC::Config.home_dir = '/home/mock_user'
+      super '/home/mock_user/.openshift/openshift.conf'
+      @ssh_dir = "#{RHC::Config.home_dir}/.ssh/"
+      @libra_server = 'mock.openshift.redhat.com'
+      @mock_user = 'mock_user@foo.bar'
+      @mock_git_installed = true
+      @mock_package_kit_installed = false
+      @current_wizard_stage = nil
+      @platform_windows = false
+    end
+
+    def run_next_stage
+      if @current_wizard_stage.nil?
+        @current_wizard_stage = 0
+      else
+        return false if @current_wizard_stage >= stages.length + 1
+        @current_wizard_stage += 1
+      end
+
+      self.send stages[@current_wizard_stage]
+    end
+
+    def stub_user_info
+      data = {:ssh_key => "",
+              :ssh_key_type => "",
+              :rhlogin => @mock_user,
+             }
+
+      data = RHC::json_encode(data)
+      stub_request(:post, "https://#{@libra_server}/broker/userinfo").to_return(:status => 200, :body => RHC::json_encode({:data => data}), :headers => {})
+    end
+
+    def stub_rest_api
+      body = {
+        "data" => {
+          "LIST_ESTIMATES" => {
+            "optional_params" => [],
+            "rel" => "List available estimates",
+            "method" => "GET",
+            "href" => "https => //@{libra_server}/broker/rest/estimates",
+            "required_params" => []
+          },
+          "API" => {"optional_params" => [],
+            "rel" => "API entry point",
+            "method" => "GET",
+            "href" => "https => //#{libra_server}/broker/rest/api",
+            "required_params" => []
+          },
+          "LIST_CARTRIDGES" => {
+            "optional_params" => [],
+            "rel" => "List cartridges",
+            "method" => "GET","href" => "https => //@{libra_server}/broker/rest/cartridges",
+            "required_params" => []
+          },
+          "GET_USER" => {
+            "optional_params" => [],
+            "rel" => "Get user information",
+            "method" => "GET",
+            "href" => "https => //#{libra_server}/broker/rest/user",
+            "required_params" => []
+          },
+          "LIST_DOMAINS" => {
+            "optional_params" => [],
+            "rel" => "List domains",
+            "method" => "GET",
+            "href" => "https => //@libra_server/broker/rest/domains",
+            "required_params" => []
+          },
+          "LIST_TEMPLATES" => {
+            "optional_params" => [],
+            "rel" => "List application templates",
+            "method" => "GET",
+            "href" => "https => //@{libra_server}/broker/rest/application_template",
+            "required_params" => []
+          },
+          "ADD_DOMAIN" => {
+            "optional_params" => [],
+            "rel" => "Create new domain",
+            "method" => "POST",
+            "href" => "https => //@{libra_server}/broker/rest/domains",
+            "required_params" => [
+              {"description" => "Name of the domain",
+               "valid_options" => [],
+               "type" => "string",
+               "name" => "id"
+              }
+            ]
+          }
+        },
+        "version" => "1.0",
+        "type" => "links",
+        "supported_api_versions" => ["1.0"],
+        "messages" => [],
+        "status" => "ok"
+      }
+
+      stub_request(:get, "https://mock_user%40foo.bar:password@mock.openshift.redhat.com/broker/rest/api").to_return(:status => 200, :body => RHC::json_encode(body), :headers => {})
+    end
+
+    def stub_ssh_keys
+      # TODO: add ssh keys if requests
+      data = {:ssh_key => "",
+              :keys => []
+             }
+
+      data = RHC::json_encode(data)
+      stub_request(:post, "https://#{@libra_server}/broker/ssh_keys").to_return(:status => 200, :body => RHC::json_encode({:data => data}))
+    end
+
+    def setup_mock_config
+      FileUtils.mkdir_p File.dirname(@config_path)
+      File.open(@config_path, "w") do |file|
+        file.puts <<EOF
+# Default user login
+default_rhlogin='#{@mock_user}'
+
+# Server API
+libra_server = '#{@libra_server}'
+EOF
+      end
+    end
+
+    def setup_mock_ssh(add_ssh_key=false)
+      FileUtils.mkdir_p @ssh_dir
+      if add_ssh_key
+        #TODO: add and ssh key to the directory
+      end
+    end
+
+    def has_git?
+      @mock_git_installed
+    end
+
+    def has_package_kit?
+      @mock_package_kit_installed
+    end
+
+    def windows?
+      @platform_windows
+    end
+  end
+
+  class FirstRunWizardDriver < RHC::Wizard
+    include WizardDriver
+  end
+
+  class RerunWizardDriver < RHC::RerunWizard
+    include WizardDriver
+  end
+end