pbox 1.17.2

data/bin/pbox

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+require 'rhc/coverage_helper'
+
+def get_args
+  ARGV.shift
+  args = ""
+  ARGV.each do|a|
+    if ( a.to_s.strip.length == 0 || a.to_s.strip.match(/\s/) ); a = "'#{a}'" end
+    args += " #{a}"
+  end
+  args
+end
+
+begin
+  Signal.trap("PIPE", "EXIT") if Signal.list["PIPE"]
+
+  retcode = begin
+    require 'rhc/cli'
+    RHC::CLI.set_terminal
+    RHC::CLI.start(ARGV)
+  rescue Interrupt
+    puts "Interrupted"
+    128 + 2
+  rescue SystemExit => e
+    puts
+    e.status
+  end
+
+  if retcode == nil
+    retcode = 1
+
+    # return codes for uncaught signals are 128 + the signal code
+    retcode = 128 + $?.termsig if $?.signaled? and !$?.termsig.nil?
+  end
+
+  exit retcode
+end

data/conf/protonbox.conf

@@ -0,0 +1,8 @@
+# Remote API server
+protonbox_server = 'api.protonbox.com'
+
+# Logging
+debug = 'false'
+
+# Timeout
+#timeout = '10'

data/features/core_feature.rb

@@ -0,0 +1,178 @@
+require 'spec_helper'
+require 'direct_execution_helper'
+
+describe "pbox core scenarios" do
+
+  it "reports a version" do
+    r = pbox '--version'
+    r.status.should == 0
+    r.stdout.should match /pbox \d+\.\d+\.\d+\b/
+  end
+
+  it "displays help" do
+    r = pbox 'help'
+    r.status.should == 0
+    r.stdout.should match "Command line interface for ProtonBox"
+    r.stdout.should match "Usage: pbox"
+    r.stdout.should match "Getting started"
+    r.stdout.should match "See 'pbox help options' for a list"
+  end
+
+  context "with a clean configuration" do
+    before{ use_clean_config }
+
+    it "walks through a configuration" do
+      r = pbox :setup, :with => setup_args
+      r.stdout.should match 'ProtonBox Client Tools'
+      r.stdout.should match 'Checking for git ...'
+      r.stdout.should match 'Checking for applications ...'
+      r.stdout.should match 'Your client tools are now configured.'
+      r.status.should == 0
+
+      r = pbox :account
+      r.stdout.should match "on #{ENV['PROTONBOX_SERVER']}"
+      r.stdout.should match 'Gears Allowed'
+      r.stdout.should match 'Allowed Gear Sizes'
+      r.stdout.should match 'Gears Used'
+      r.stdout.should match 'SSL Certificates'
+    end
+
+    it "starts the wizard on default invocation" do
+      r = pbox
+      r.stdout.should match "ProtonBox Client Tools"
+    end
+  end
+
+  context "when creating an app" do
+    when_running 'create-app', 'test1', a_web_cartridge
+    before{ no_applications }
+    it "returns the proper info and is in the rest api" do
+      status.should == 0
+      output.should match "Your application 'test1' is now available"
+      output.should match /Gear Size: .*default/
+      output.should match /Scaling: .*no/
+      output.should match %r(URL: .*http://test1-)
+      output.should match "Cloned to"
+
+      apps = client.applications
+      apps.should_not be_empty
+      apps.should include{ |app| app.name == 'test1' }
+    end
+  end
+
+  context "with an existing app" do
+    before(:all) do
+      standard_config
+      @app = has_an_application
+    end
+
+    let(:app){ @app }
+
+    it "should display domain list" do
+      r = pbox 'domains'
+      r.status.should == 0
+      r.stdout.should match "Domain #{app.domain_id}"
+    end
+
+    it "should show app state" do
+      r = pbox 'app-show', app.name, '--state'
+      r.status.should == 0
+      r.stdout.should match "Cartridge #{a_web_cartridge} is started"
+    end
+
+    it "should stop and start the app" do
+      r = pbox 'stop-app', app.name
+      r.status.should == 0
+      r.stdout.should match "#{app.name} stopped"
+      r = pbox 'start-app', app.name
+      r.status.should == 0
+      r.stdout.should match "#{app.name} started"
+    end
+
+    it "should show gear status" do
+      r = pbox 'app-show', app.name, '--gears'
+      r.status.should == 0
+      r.stdout.lines.to_a.length.should == 3
+      r.stdout.should match app.ssh_string
+      app.cartridges.map(&:name).each do |c|
+        r.stdout.should match c
+      end
+      r.stdout.should match "started"
+    end
+
+    it "should show gear ssh strings" do
+      r = pbox 'app-show', app.name, '--gears', 'ssh'
+      r.status.should == 0
+      r.stdout.lines.to_a.length.should == 1
+      r.stdout.chomp.should == app.ssh_string
+    end
+
+    context "when the app is cloned" do
+      before(:all) do
+        pbox('git-clone', @app.name).status.should == 0
+        Dir.exists?(@app.name).should be_true
+        Dir.chdir @app.name
+      end
+      let(:git_config){ `git config --list` }
+
+      it "will set Git config values" do
+        git_config.should match "pbox.app-id=#{app.id}"
+        git_config.should match "pbox.app-name=#{app.name}"
+        git_config.should match "pbox.domain-name=#{app.domain_name}"
+      end
+
+      it "will infer the current app from the git repository" do
+        r = pbox 'show-app'
+        r.stdout.should match app.name
+        r.stdout.should match app.id
+        r.stdout.should match app.ssh_string
+        r.stdout.should match app.app_url
+        (app.cartridges.map(&:name) + app.cartridges.map(&:display_name)).each{ |n| r.stdout.should match n }
+        r.status.should == 0
+      end
+
+      it "will fetch the quotas from the app" do
+        r = pbox 'show-app', '--gears', 'quota'
+        r.stdout.chomp.lines.count.should == (app.gear_count + 2)
+        app.cartridges.map(&:name).each{ |n| r.stdout.should match n }
+        app.cartridges.map(&:gear_storage).each{ |n| r.stdout.should match(RHC::Helpers.human_size(n)) }
+        r.status.should == 0
+      end
+
+      it "will ssh to the app and run a command" do
+        r = pbox 'ssh', '--', '--ssh', ENV['GIT_SSH'], 'echo $PROTONBOX_APP_NAME'
+        r.stdout.should match app.name
+        r.status.should == 0
+      end
+    end
+  end
+
+  context "when adding a cartridge" do
+    context "with a scalable app" do
+      before(:all) do
+        standard_config
+        @app = has_a_scalable_application
+      end
+
+      after(:all) do
+        pbox 'app-delete', @app.name
+      end
+
+      let(:app){ @app }
+
+      it "should add a cartridge with small gear size" do
+        r = pbox 'add-cartridge', an_addon_cartridge, '-a', app.name, '--gear-size', 'small'
+        r.stdout.should match /#{an_addon_cartridge}/
+        r.stdout.should match /Gears:\s+1 small/
+        r.status.should == 0
+      end
+
+      it "should fail for a cartridge with not allowed gear size" do
+        r = pbox 'add-cartridge', an_addon_cartridge, '-a', app.name, '--gear-size', 'medium'
+        r.stdout.should match "The gear size 'medium' is not valid for this domain. Allowed sizes: small."
+        r.status.should_not == 0
+      end
+    end
+
+  end
+end

data/features/deployments_feature.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+require 'direct_execution_helper'
+require 'httpclient'
+require 'fileutils'
+
+DEPLOYMENT_LIST_ITEM = /([0-2]?[0-9]:[0-5][0-9] (AM|PM), deployment [a-f0-9]{8})/
+
+describe "pbox deployment scenarios" do
+  context "with an existing app" do
+    before(:all) do
+      standard_config
+      @app = has_an_application
+    end
+
+    let(:app){ @app }
+
+    it "should display deployment list" do
+      r = list_deployments
+      r.stdout.should match DEPLOYMENT_LIST_ITEM
+    end
+
+    it "should configure the app for a git ref deployment" do
+      r = configure_app_for_manual_git_deployment
+      r.stdout.should match /Deployment:\s+manual/
+      r.stdout.should match /Keep Deployments:\s+10/
+      r.stdout.should match /Deployment Type:\s+git/
+      r.stdout.should match /Deployment Branch:\s+master/
+    end
+
+    it "should configure the app for a binary deployment" do
+      r = configure_app_for_manual_binary_deployment
+      r.stdout.should match /Deployment:\s+manual/
+      r.stdout.should match /Keep Deployments:\s+10/
+      r.stdout.should match /Deployment Type:\s+binary/
+      r.stdout.should match /Deployment Branch:\s+master/
+    end
+
+    it "should deploy a git ref" do
+      configure_app_for_manual_git_deployment
+      r = deploy_master
+      r.stdout.should match /Deployment of git ref 'master' in progress for application #{app.name}/
+      r.stdout.should match /Success/
+      r = list_deployments
+      r.stdout.should match DEPLOYMENT_LIST_ITEM
+      r.stdout.scan(DEPLOYMENT_LIST_ITEM).length.should > 1
+    end
+
+    it "should perform a complete deploy workflow" do
+      configure_app_for_manual_git_deployment
+      edit_simple_change 'Welcome to Test'
+      app_page_content.should match /Welcome to ProtonBox/
+      app_page_content.should_not match /Welcome to Test/
+      deploy_master
+      app_page_content.should match /Welcome to Test/
+      app_page_content.should_not match /Welcome to ProtonBox/
+      deployment_id = find_inactive_deployment
+      deployment_id.should_not be_nil
+      activate deployment_id
+      app_page_content.should match /Welcome to ProtonBox/
+      app_page_content.should_not match /Welcome to Test/
+    end
+
+    private
+      def configure_app_for_manual_git_deployment
+        ensure_command 'configure-app', app.name, '--no-auto-deploy', '--keep-deployments', 10, '--deployment-type', 'git'
+      end
+
+      def configure_app_for_manual_binary_deployment
+        ensure_command 'configure-app', app.name, '--no-auto-deploy', '--keep-deployments', 10, '--deployment-type', 'binary'
+      end
+
+      def list_deployments
+        ensure_command 'deployments', app.name
+      end
+
+      def deploy(ref)
+        ensure_command 'deploy', ref, '-a', app.name
+      end
+
+      def deploy_master
+        deploy 'master'
+      end
+
+      def activate(deployment_id)
+        ensure_command 'activate-deployment', deployment_id, '-a', app.name
+      end
+
+      def snapshot_deployment
+        ensure_command 'save-snapshot', app.name, '--deployment'
+      end
+
+      def git_clone
+        ensure_command 'git-clone', app.name, '-r', git_directory
+        Dir.exists?(git_directory).should be_true
+      end
+
+      def edit_simple_change(content)
+        FileUtils.rm_rf git_directory
+        git_clone
+        Dir.chdir git_directory
+        `sed -i "s/Welcome to ProtonBox/#{content}/" php/index.php`
+        `git commit -a -m "Commit from Feature Tests"`
+        `git push origin master`
+        Dir.chdir '../'
+        FileUtils.rm_rf git_directory
+      end
+
+      def app_page_content
+        HTTPClient.new.get_content(app.app_url)
+      end
+
+      def git_directory
+        "#{app.name}_feature_tests_repo"
+      end
+
+      def find_inactive_deployment
+        r = list_deployments
+        r.stdout.match(/deployment ([a-f0-9]{8})/)[1]
+      end
+
+      def ensure_command(*args)
+        r = pbox *args
+        r.status.should == 0
+        r
+      end
+  end
+end

data/features/domains_feature.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'direct_execution_helper'
+
+describe "pbox domain scenarios" do
+  context "with an existing domain" do
+    before(:all) do
+      standard_config
+      @domain = has_a_domain
+    end
+    let(:domain){ @domain }
+
+    it "should display the domain configuration" do
+      r = pbox 'configure-domain', domain.name
+      r.status.should == 0
+      if domain.allowed_gear_sizes
+        r.stdout.should match "Allowed Gear Sizes:\s+#{domain.allowed_gear_sizes.join(", ")}"
+      else
+        r.stdout.should_not match "Allowed Gear Sizes:"
+      end
+    end
+
+    it "should change the domain configuration" do
+      r = pbox 'configure-domain', domain.name, '--no-allowed-gear-sizes'
+      r.status.should == 0
+      r.stdout.should match "Allowed Gear Sizes:\s+<none>$"
+      client.reset.find_domain(domain.name).allowed_gear_sizes.should == []
+
+      all_sizes = client.user.capabilities.gear_sizes
+      r = pbox 'configure-domain', domain.name, '--allowed-gear-sizes', all_sizes.join(',')
+      r.status.should == 0
+      r.stdout.should match "Allowed Gear Sizes:\s+#{all_sizes.join(', ')}$"
+      client.reset.find_domain(domain.name).allowed_gear_sizes.should == all_sizes
+    end
+
+    it "should reject invalid gear size configuration changes" do
+      all_sizes = client.user.capabilities.gear_sizes
+
+      r = pbox 'configure-domain', domain.name, '--allowed-gear-sizes', '_not_a_size_'
+      r.status.should_not == 1
+      r.stdout.should match "Updating domain configuration.*The following gear sizes are invalid: _not_a_size_"
+      client.reset.find_domain(domain.name).allowed_gear_sizes.should == all_sizes
+
+      r = pbox 'configure-domain', domain.name, '--allowed-gear-sizes'
+      r.status.should_not == 1
+      r.stdout.should match "invalid option: Provide a comma delimited .* --allowed-gear-sizes"
+      client.reset.find_domain(domain.name).allowed_gear_sizes.should == all_sizes
+    end
+  end
+end

data/features/keys_feature.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'direct_execution_helper'
+
+describe "pbox sshkey scenarios" do
+  context "with an existing domain" do
+    before(:all) do
+      standard_config
+      @domain = has_a_domain
+    end
+
+    let(:domain){ @domain }
+
+    context "with an application" do
+      before{ has_an_application }
+
+      it "should add and remove kerberos keys on gear" do
+        app = @domain.applications.first
+        keyname = "key#{rand(1000000000000)}"
+        keycontent = "principal#{rand(1000000000000)}"
+        
+        r = pbox 'sshkey', 'add', keyname, '--type', 'krb5-principal', '--content', keycontent
+        r.status.should == 0
+
+        r = pbox 'ssh', app.name, '-n', domain.name, '--ssh', ssh_exec_for_env, '--', 'if [ -f .k5login ]; then cat .k5login; fi'
+        r.status.should == 0
+        r.stdout.should match(Regexp.new("#{keyname}\n#{keycontent}"))
+
+        r = pbox 'sshkey', 'remove', keyname
+        r.status.should == 0
+
+        r = pbox 'ssh', app.name, '-n', domain.name, '--ssh', ssh_exec_for_env, '--', 'if [ -f .k5login ]; then cat .k5login; fi'
+        r.status.should == 0
+        r.stdout.should_not match(Regexp.new("#{keyname}\n#{keycontent}"))
+      end
+    end
+  end
+end

data/features/members_feature.rb

@@ -0,0 +1,166 @@
+require 'spec_helper'
+require 'direct_execution_helper'
+
+describe "pbox member scenarios" do
+  context "with an existing domain" do
+    before(:all) do
+      standard_config
+      @domain = has_a_domain
+    end
+
+    let(:domain){ @domain }
+
+    context "with no users" do
+      before{ no_members(domain) }
+
+      it "should not show members in the domain" do
+        r = pbox 'show-domain', domain.name
+        r.status.should == 0
+        r.stdout.should_not match "Members:"
+        r.stdout.should match "owned by #{domain.owner}"
+      end
+
+      it "should prevent leaving the domain for the owner" do
+        r = pbox 'leave-domain', domain.name
+        r.status.should_not == 1
+        r.stdout.should match "Leaving domain.*You are the owner of this domain and cannot leave"
+      end
+
+      it "should add and remove a member" do
+        user = other_users.keys.take(1).first
+        r = pbox 'add-member', user, '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Adding 1 editor to domain"
+        r.stdout.should match "done"
+        client.find_domain(domain.name).members.any?{ |m| m.id == other_users[user].id && m.editor? }.should be_true
+
+        r = pbox 'show-domain', domain.name
+        r.status.should == 0
+        r.stdout.should match "Members:"
+        r.stdout.should match "#{user} \\(edit\\)"
+
+        r = pbox 'remove-member', user, '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Removing 1 member from domain"
+        client.find_domain(domain.name).members.none?{ |m| m.id == other_users[user].id }.should be_true
+      end
+
+      it "should add and remove two members" do
+        user1, user2 = other_users.keys.take(2)
+        r = pbox 'add-member', user1, user2, '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Adding 2 editors to domain"
+        r.stdout.should match "done"
+        members = client.find_domain(domain.name).members
+        members.any?{ |m| m.id == other_users[user1].id && m.editor? }.should be_true
+        members.any?{ |m| m.id == other_users[user2].id && m.editor? }.should be_true
+
+        r = pbox 'show-domain', domain.name
+        r.status.should == 0
+        r.stdout.should match "Members:"
+        r.stdout.should match "#{user1} \\(edit\\)"
+        r.stdout.should match "#{user2} \\(edit\\)"
+
+        r = pbox 'remove-member', user1, user2, '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Removing 2 members from domain"
+        client.find_domain(domain.name).members.none?{ |m| m.id == other_users[user1].id }.should be_true
+        client.find_domain(domain.name).members.none?{ |m| m.id == other_users[user2].id }.should be_true
+      end
+
+      it "should add a view and an admin member. and allow users to leave the domain" do
+        user1, user2 = other_users.keys.take(2)
+
+        r = pbox 'add-member', user1, '--role', 'admin', '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Adding 1 administrator to domain"
+        r.stdout.should match "done"
+        client.find_domain(domain.name).members.any?{ |m| m.id == other_users[user1].id && m.admin? }.should be_true
+
+        r = pbox 'add-member', user2, '--role', 'view', '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Adding 1 viewer to domain"
+        r.stdout.should match "done"
+        client.find_domain(domain.name).members.any?{ |m| m.id == other_users[user2].id && m.viewer? }.should be_true
+
+        r = pbox 'show-domain', domain.name
+        r.status.should == 0
+        r.stdout.should match "Members:"
+        r.stdout.should match "#{user1} \\(admin\\)"
+        r.stdout.should match "#{user2} \\(view\\)"
+
+        r = pbox 'leave-domain', domain.name, :as => other_users[user2]
+        r.status.should == 0
+        r.stdout.should match "Leaving domain.*done"
+      end
+
+      it "should remove all non owners" do
+        user1, user2 = other_users.keys.take(2)
+        r = pbox 'add-member', user1, user2, '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Adding 2 editors to domain"
+        r.stdout.should match "done"
+        members = client.find_domain(domain.name).members
+        members.any?{ |m| m.id == other_users[user1].id && m.editor? }.should be_true
+        members.any?{ |m| m.id == other_users[user2].id && m.editor? }.should be_true
+
+        r = pbox 'remove-member', domain.name, '--all'
+        r.status.should == 0
+        r.stdout.should match "Removing all members from domain.*done"
+        members = client.find_domain(domain.name).members
+        members.select(&:owner).should == members
+      end
+
+      it "should reject a non-existent user" do
+        r = pbox 'add-member', 'not-a-user', '-n', domain.name
+        r.status.to_i.should == 256
+        r.stdout.should match "There is no account with login not-a-user."
+        client.find_domain(domain.name).members.length.should == 1
+      end
+
+      it "should add a user by id" do
+        user = other_users.values.take(1).first
+        r = pbox 'add-member', user.id, '--ids', '-n', domain.name
+        r.status.should == 0
+        r.stdout.should match "Adding 1 editor to domain"
+        r.stdout.should match "done"
+        client.find_domain(domain.name).members.any?{ |m| m.id == user.id && m.editor? }.should be_true
+      end
+    end
+
+    context "with an application" do
+      let(:other_user){ other_users.values.first }
+      before{ has_an_application }
+      before{ has_local_ssh_key(other_user) }
+
+      it "should allow SSH only for admin and edit roles" do
+        user = other_user.login
+        name = @domain.applications.first.name
+
+        r = pbox 'add-member', user, '--role', 'admin', '-n', domain.name
+        r.status.should == 0
+
+        with_environment(other_user) do
+          r = pbox 'ssh', name, '-n', domain.name, '--ssh', ssh_exec_for_env
+          r.status.should == 0
+        end
+
+        r = pbox 'add-member', user, '--role', 'view', '-n', domain.name
+        r.status.should == 0
+
+        with_environment(other_user) do
+          r = pbox 'ssh', name, '-n', domain.name, '--ssh', ssh_exec_for_env
+          r.status.to_i.should_not == 0
+        end
+
+        r = pbox 'add-member', user, '--role', 'edit', '-n', domain.name
+        r.status.should == 0
+
+        with_environment(other_user) do
+          r = pbox 'ssh', name, '-n', domain.name, '--ssh', ssh_exec_for_env
+          r.status.should == 0
+        end
+      end
+    end
+  end
+end

data/lib/rhc/auth/basic.rb

@@ -0,0 +1,64 @@
+module RHC::Auth
+  class Basic
+    def initialize(*args)
+      if args[0].is_a?(String) or args.length > 1
+        @username, @password = args
+      else
+        @options = args[0] || Commander::Command::Options.new
+        @username = options[:pblogin]
+        @password = options[:password]
+        @no_interactive = options[:noprompt]
+      end
+      @skip_interactive = !@password.nil?
+    end
+
+    def to_request(request)
+      request[:user] ||=
+        lambda{ username || (request[:lazy_auth] != true && ask_username) || nil }
+      request[:password] ||=
+        lambda{ password || (username? && request[:lazy_auth] != true && ask_password) || nil }
+      request
+    end
+
+    def retry_auth?(response, client)
+      if response.status == 401
+        credentials_rejected
+      else
+        false
+      end
+    end
+
+    def can_authenticate?
+      username? and not (password.nil? and @skip_interactive and @no_interactive)
+    end
+
+    attr_reader :username
+
+    protected
+      include RHC::Helpers
+      attr_reader :options, :password
+
+      def credentials_rejected
+        error "Username or password is not correct" if username? && password
+        unless @skip_interactive or @no_interactive
+          ask_username unless username?
+          ask_password
+          true
+        end
+      end
+
+      def ask_username
+        @username = ask("Login to #{protonbox_server}: ") unless @no_interactive
+      end
+      def ask_password
+        @password = ask("Password: ") { |q|
+          q.echo = '*'
+          q.whitespace = :chomp
+        } unless @no_interactive
+      end
+
+      def username?
+        username.present?
+      end
+  end
+end