startapp 0.1.11 → 0.1.13

data/lib/rhc/commands/snapshot.rb

@@ -5,7 +5,7 @@ module RHC::Commands
     summary "Save the current state of your application locally"
     syntax "<action>"
     description <<-DESC
-      Snapshots allow you to export the current state of your OpenShift application
+      Snapshots allow you to export the current state of your StartApp application
       into an archive on your local system, and then to restore it later.
 
       The snapshot archive contains the Git repository, dumps of any attached databases,
@@ -21,49 +21,19 @@ module RHC::Commands
     syntax "<application> [--filepath FILE] [--ssh path_to_ssh_executable]"
     takes_application :argument => true
     option ["-f", "--filepath FILE"], "Local path to save tarball (default: ./$APPNAME.tar.gz)"
-    option ["--deployment"], "Snapshot as a deployable file which can be deployed with 'rhc deploy'"
+    option ["--deployment"], "Snapshot as a deployable file which can be deployed with 'app deploy'"
     option ["--ssh PATH"], "Full path to your SSH executable with additional options"
     alias_action :"app snapshot save", :root_command => true, :deprecated => true
     def save(app)
-      ssh = check_ssh_executable! options.ssh
+
       rest_app = find_app
 
       raise RHC::DeploymentsNotSupportedException.new if options.deployment && !rest_app.supports?("DEPLOY")
 
-      ssh_uri = URI.parse(rest_app.ssh_url)
       filename = options.filepath ? options.filepath : "#{rest_app.name}.tar.gz"
 
-      snapshot_cmd = options.deployment ? 'gear archive-deployment' : 'snapshot'
-      ssh_cmd = "#{ssh} #{ssh_uri.user}@#{ssh_uri.host} '#{snapshot_cmd}' > #{filename}"
-      debug ssh_cmd
-
-      say "Pulling down a snapshot to #{filename}..."
+      save_snapshot(rest_app, filename, options.deployment, options.ssh)
 
-      begin
-        if !RHC::Helpers.windows?
-          status, output = exec(ssh_cmd)
-          if status != 0
-            debug output
-            raise RHC::SnapshotSaveException.new "Error in trying to save snapshot. You can try to save manually by running:\n#{ssh_cmd}"
-          end
-        else
-          Net::SSH.start(ssh_uri.host, ssh_uri.user) do |ssh|
-            File.open(filename, 'wb') do |file|
-              ssh.exec! "snapshot" do |channel, stream, data|
-                if stream == :stdout
-                  file.write(data)
-                else
-                  debug data
-                end
-              end
-            end
-          end
-        end
-      rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EADDRINUSE, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
-        debug e.backtrace
-        raise RHC::SnapshotSaveException.new "Error in trying to save snapshot. You can try to save manually by running:\n#{ssh_cmd}"
-      end
-      results { say "Success" }
       0
     end
 
@@ -74,59 +44,14 @@ module RHC::Commands
     option ["--ssh PATH"], "Full path to your SSH executable with additional options"
     alias_action :"app snapshot restore", :root_command => true, :deprecated => true
     def restore(app)
-      ssh = check_ssh_executable! options.ssh
       rest_app = find_app
       filename = options.filepath ? options.filepath : "#{rest_app.name}.tar.gz"
 
       if File.exists? filename
-
-        include_git = RHC::Helpers.windows? ? true : RHC::TarGz.contains(filename, './*/git')
-        ssh_uri = URI.parse(rest_app.ssh_url)
-
-        ssh_cmd = "cat '#{filename}' | #{ssh} #{ssh_uri.user}@#{ssh_uri.host} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
-
-        say "Restoring from snapshot #{filename}..."
-        debug ssh_cmd
-
-        begin
-          if !RHC::Helpers.windows?
-            status, output = exec(ssh_cmd)
-            if status != 0
-              debug output
-              raise RHC::SnapshotRestoreException.new "Error in trying to restore snapshot. You can try to restore manually by running:\n#{ssh_cmd}"
-            end
-          else
-            ssh = Net::SSH.start(ssh_uri.host, ssh_uri.user)
-            ssh.open_channel do |channel|
-              channel.exec("restore#{include_git ? ' INCLUDE_GIT' : ''}") do |ch, success|
-                channel.on_data do |ch, data|
-                  say data
-                end
-                channel.on_extended_data do |ch, type, data|
-                  say data
-                end
-                channel.on_close do |ch|
-                  say "Terminating..."
-                end
-                File.open(filename, 'rb') do |file|
-                  file.chunk(1024) do |chunk|
-                    channel.send_data chunk
-                  end
-                end
-                channel.eof!
-              end
-            end
-            ssh.loop
-          end
-        rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EADDRINUSE, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
-          debug e.backtrace
-          raise RHC::SnapshotRestoreException.new "Error in trying to restore snapshot. You can try to restore manually by running:\n#{ssh_cmd}"
-        end
-
+        restore_snapshot(rest_app, filename, options.ssh)
       else
         raise RHC::SnapshotRestoreException.new "Archive not found: #{filename}"
       end
-      results { say "Success" }
       0
     end
 

data/lib/rhc/commands/team.rb

@@ -0,0 +1,103 @@
+require 'rhc/commands/base'
+
+module RHC::Commands
+  class Team < Base
+    summary "Create or delete a team"
+    syntax "<action>"
+    description <<-DESC
+      People who typically share the same role can be added to a team. The team can
+      then be added as a member of a domain, and all of the people in the team will
+      inherit the team's role on the domain.
+
+      If a person is a member of multiple teams which are members of a domain, or
+      is also added as a domain member individually, their effective role is the
+      higher of their individual role or their teams' roles on the domain.
+
+      To create a team, run 'app create-team'.
+
+      To add members to an existing team, use the 'app add-member' command.
+
+      To list members of an existing team, use the 'app members' command.
+      DESC
+    default_action :help
+
+    summary "Create a new team"
+    syntax "<team_name>"
+    description <<-DESC
+      People who typically share the same role can be added to a team. The team can
+      then be added as a member of a domain, and all of the people in the team will
+      inherit the team's role on the domain.
+
+      If a person is a member of multiple teams which are members of a domain, or
+      is also added as a domain member individually, their effective role is the
+      higher of their individual role or their teams' roles on the domain.
+      DESC
+    argument :team_name, "New team name (min 2 chars, max 250 chars)", ["-t", "--team-name NAME"]
+    def create(name)
+      say "Creating team '#{name}' ... "
+      rest_client.add_team(name)
+      success "done"
+
+      info "You may now add team members using the 'app add-member' command"
+
+      0
+    end
+
+    summary "Display a team and its members"
+    syntax "<team_name>"
+    takes_team :argument => true
+    def show(_)
+      team = find_team
+
+      display_team(team, true)
+
+      0
+    end
+
+    summary "Display all teams you are a member of"
+    option ['--mine'], "Display only teams you own"
+    alias_action :teams, :root_command => true
+    def list
+      teams = rest_client.send(options.mine ? :owned_teams : :teams, {:include => "members"})
+
+      teams.each do |t|
+        display_team(t, true)
+      end
+
+      if options.mine
+        success "You have #{pluralize(teams.length, 'team')}."
+      else
+        success "You are a member of #{pluralize(teams.length, 'team')}."
+      end
+
+      0
+    end
+
+    summary "Delete a team"
+    syntax "<team_name>"
+    takes_team :argument => true
+    def delete(_)
+      team = find_team(:owned => true)
+
+      say "Deleting team '#{team.name}' ... "
+      team.destroy
+      success "deleted"
+
+      0
+    end
+
+    summary "Leave a team (remove your membership)"
+    syntax "<team_name> [-t TEAM_NAME] [--team-id TEAM_ID]"
+    takes_team :argument => true
+    def leave(_)
+      team = find_team
+
+      say "Leaving team ... "
+      result = team.leave
+      success "done"
+      result.messages.each{ |s| paragraph{ say s } }
+
+      0
+    end
+  end
+end

data/lib/rhc/context_helper.rb

@@ -10,21 +10,43 @@ module RHC
 
     def self.included(other)
       other.module_eval do
+        def self.takes_team(opts={})
+          if opts[:argument]
+            argument :team_name, "Name of a team", ["-t", "--team-name NAME"], :allow_nil => true, :covered_by => :team_id
+          else
+            #:nocov:
+            option ["-t", "--team-name NAME"], "Name of a team", :covered_by => :team_id
+            #:nocov:
+          end
+          option ["--team-id ID"], "ID of a team", :covered_by => :team_name
+        end
+
         def self.takes_domain(opts={})
           if opts[:argument]
             argument :namespace, "Name of a domain", ["-n", "--namespace NAME"], :allow_nil => true, :default => :from_local_git
           else
+            #:nocov:
             option ["-n", "--namespace NAME"], "Name of a domain", :default => :from_local_git
+            #:nocov:
           end
         end
-        # Does not take defaults to avoid conflicts
-        def self.takes_application_or_domain(opts={})
-          option ["-n", "--namespace NAME"], "Name of a domain"
-          option ["-a", "--app NAME"], "Name of an application"
-          if opts[:argument]
-            argument :target, "The name of a domain, or an application name with domain (domain or domain/application)", ["-t", "--target NAME_OR_PATH"], :allow_nil => true, :covered_by => [:application_id, :namespace, :app]
+
+        def self.takes_membership_container(opts={})
+          if opts && opts[:argument]
+            if opts && opts[:writable]
+              #:nocov:
+              argument :namespace, "Name of a domain", ["-n", "--namespace NAME"], :allow_nil => true, :default => :from_local_git
+              #:nocov:
+            else
+              argument :target, "The name of a domain, or an application name with domain (domain or domain/application)", ["--target NAME_OR_PATH"], :allow_nil => true, :covered_by => [:application_id, :namespace, :app]
+            end
           end
+          option ["-n", "--namespace NAME"], "Name of a domain"
+          option ["-a", "--app NAME"], "Name of an application" unless opts && opts[:writable]
+          option ["-t", "--team-name NAME"], "Name of a team"
+          option ["--team-id ID"], "ID of a team"
         end
+
         def self.takes_application(opts={})
           if opts[:argument]
             argument :app, "Name of an application", ["-a", "--app NAME"], :allow_nil => true, :default => :from_local_git, :covered_by => :application_id
@@ -37,6 +59,18 @@ module RHC
       end
     end
 
+    def find_team(opts={})
+      if id = options.team_id.presence
+        return rest_client.find_team_by_id(id, opts)
+      end
+      team_name = (opts && opts[:team_name]) || options.team_name
+      if team_name.present?
+        rest_client.find_team(team_name, opts)
+      else
+        raise ArgumentError, "You must specify a team name with -t, or a team id with --team-id."
+      end
+    end
+
     def find_domain(opts={})
       domain = options.namespace || options.target || namespace_context
       if domain
@@ -46,7 +80,7 @@ module RHC
       end
     end
 
-    def find_app_or_domain(opts={})
+    def find_membership_container(opts={})
       domain, app =
         if options.target.present?
           options.target.split(/\//)
@@ -57,32 +91,40 @@ module RHC
             [options.namespace || namespace_context, options.app]
           end
         end
-      if app && domain
+
+      if options.team_id.present?
+        rest_client.find_team_by_id(options.team_id)
+      elsif options.team_name.present?
+        rest_client.find_team(options.team_name)
+      elsif app && domain
         rest_client.find_application(domain, app)
       elsif domain
         rest_client.find_domain(domain)
+      elsif opts && opts[:writable]
+        raise ArgumentError, "You must specify a domain with -n, or a team with -t."
       else
-        raise ArgumentError, "You must specify a domain with -n, or an application with -a."
+        raise ArgumentError, "You must specify a domain with -n, an application with -a, or a team with -t."
       end
     end
 
     def find_app(opts={})
-      if id = options.application_id
+      if id = options.application_id.presence
         if opts.delete(:with_gear_groups)
           return rest_client.find_application_by_id_gear_groups(id, opts)
         else
           return rest_client.find_application_by_id(id, opts)
         end
       end
+      option = (opts && opts[:app]) || options.app
       domain, app =
-        if options.app
-          if options.app =~ /\//
-            options.app.split(/\//)
+        if option
+          if option =~ /\//
+            option.split(/\//)
           else
-            [options.namespace || namespace_context, options.app]
+            [options.namespace || namespace_context, option]
           end
         end
-      if app && domain
+      if app.present? && domain.present?
         if opts.delete(:with_gear_groups)
           rest_client.find_application_gear_groups(domain, app, opts)
         else

data/lib/rhc/exceptions.rb

@@ -67,6 +67,24 @@ module RHC
     end
   end
 
+  class TeamsNotSupportedException < Exception
+    def initialize(message="Server does not support teams")
+      super message, 161
+    end
+  end
+
+  class TeamNotFoundException < Exception
+    def initialize(message="Team not found")
+      super message, 162
+    end
+  end
+
+  class MemberNotFoundException < Exception
+    def initialize(message="Member not found")
+      super message, 163
+    end
+  end
+
   class GitPermissionDenied < GitException; end
   class GitDirectoryExists < GitException; end
 
@@ -138,6 +156,12 @@ module RHC
     end
   end
 
+  class AppCloneNotSupportedException < Exception
+    def initialize(message="The server does not support cloning apps")
+      super message, 134
+    end
+  end
+
   class MissingScalingValueException < Exception
     def initialize(message="Must provide either a min or max value for scaling")
       super message
@@ -190,13 +214,13 @@ module RHC
   end
 
   class ChangeMembersOnResourceNotSupported < Exception
-    def initialize(message="You can only add or remove members on a domain.")
+    def initialize(message="You can only add or remove members on a domain or team.")
       super message, 1
     end
   end
 
   class MembersNotSupported < Exception
-    def initialize(message="The server does not support adding or removing members.")
+    def initialize(message="The server does not support adding or removing members on this resource.")
       super message, 1
     end
   end

data/lib/rhc/git_helpers.rb

@@ -60,7 +60,7 @@ module RHC
     # :nocov: These all call external binaries so test them in cucumber
     def git_config_get(key)
       return nil unless has_git?
-
+      
       config_get_cmd = "#{git_cmd} config --get #{key}"
       value = %x[#{config_get_cmd}].strip
       debug "Git config '#{config_get_cmd}' returned '#{value}'"

data/lib/rhc/helpers.rb

@@ -437,7 +437,7 @@ module RHC
     def run_with_tee(cmd)
       status, stdout, stderr = nil
 
-      if windows?
+      if windows? || jruby?
         #:nocov: TODO: Test block
         system(cmd)
         status = $?.exitstatus

data/lib/rhc/output_helpers.rb

@@ -1,6 +1,24 @@
 module RHC
   module OutputHelpers
 
+    def display_team(team, ids=false)
+      paragraph do
+        header ["Team #{team.name}", ("(owned by #{team.owner})" if team.owner.present?)] do
+          section(:bottom => 1) do
+            say format_table \
+              nil,
+              get_properties(
+                team,
+                (:id if ids),
+                (:global if team.global?),
+                :compact_members
+              ),
+              :delete => true
+          end
+        end
+      end
+    end
+
     def display_domain(domain, applications=nil, ids=false)
       paragraph do
         header ["Domain #{domain.name}", ("(owned by #{domain.owner})" if domain.owner.present?)] do
@@ -26,7 +44,7 @@ module RHC
     #---------------------------
     # Application information
     #---------------------------
-    def display_app(app, cartridges=nil, properties=nil)
+    def display_app(app, cartridges=nil, properties=nil, verbose=false)
       paragraph do
         header [app.name, "@ #{app.app_url}", "(uuid: #{app.uuid})"] do
           section(:bottom => 1) do
@@ -43,7 +61,7 @@ module RHC
                 :aliases]),
               :delete => true
           end
-          cartridges.each{ |c| section(:bottom => 1){ display_cart(c) } } if cartridges
+          cartridges.each{ |c| section(:bottom => 1){ display_cart(c, verbose ? :verbose : []) } } if cartridges
         end
       end
     end
@@ -69,6 +87,8 @@ module RHC
         format_scaling_info(cart.scaling)
       elsif cart.shares_gears?
         "Located with #{cart.collocated_with.join(", ")}"
+      elsif cart.external? && cart.current_scale == 0
+        "none (external service)"
       else
         "%d %s" % [format_value(:current_scale, cart.current_scale), format_value(:gear_profile, cart.gear_profile)]
       end
@@ -84,13 +104,18 @@ module RHC
     #---------------------------
 
     def display_cart(cart, *properties)
+      verbose = properties.delete(:verbose)
       say format_table \
         format_cart_header(cart),
-        get_properties(cart, *properties).
-          concat([[:downloaded_cartridge_url, cart.url]]).
-          concat([[cart.scalable? ? :scaling : :gears, format_cart_gears(cart)]]).
-          concat(cart.properties.map{ |p| ["#{table_heading(p['name'])}:", p['value']] }.sort{ |a,b| a[0] <=> b[0] }).
-          concat(cart.environment_variables.present? ? [[:environment_variables, cart.environment_variables.map{|item| "#{item[:name]}=#{item[:value]}" }.sort.join(', ')]] : []),
+          get_properties(cart, *properties).
+            concat(verbose && cart.custom? ? [[:description, cart.description.strip]] : []).
+            concat([[:downloaded_cartridge_url, cart.url]]).
+            concat(verbose && cart.custom? ? [[:version, cart.version]] : []).
+            concat(verbose && cart.custom? && cart.license.strip.downcase != 'unknown' ? [[:license, cart.license]] : []).
+            concat(cart.custom? ? [[:website, cart.website]] : []).
+            concat([[cart.scalable? ? :scaling : :gears, format_cart_gears(cart)]]).
+            concat(cart.properties.map{ |p| ["#{table_heading(p['name'])}:", p['value']] }.sort{ |a,b| a[0] <=> b[0] }).
+            concat(cart.environment_variables.present? ? [[:environment_variables, cart.environment_variables.map{|item| "#{item[:name]}=#{item[:value]}" }.sort.join(', ')]] : []),
         :delete => true
 
       say format_usage_message(cart) if cart.usage_rate?
@@ -248,7 +273,7 @@ module RHC
         when :activations
           value.collect{|item| date(item.created_at.to_s)}.join("\n")
         when :auto_deploy
-          value ? 'auto (on git push)' : "manual (use 'rhc deploy')"
+          value ? 'auto (on git push)' : "manual (use 'app deploy')"
         else
           case value
           when Array then value.empty? ? '<none>' : value.join(', ')

data/lib/rhc/rest/api.rb

@@ -67,7 +67,7 @@ module RHC
         if !api_version_match?
           warn "WARNING: API version mismatch. This client supports #{client_api_versions.join(', ')} but
 server at #{URI.parse(client.url).host} supports #{@server_api_versions.join(', ')}."
-          warn "The client version may be outdated; please consider updating 'rhc'. We will continue, but you may encounter problems."
+          warn "The client version may be outdated; please consider updating 'app'. We will continue, but you may encounter problems."
         end
       end
 

data/lib/rhc/rest/cartridge.rb

@@ -5,7 +5,8 @@ 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, :automatic_updates
+                  :additional_gear_storage, :url, :environment_variables, :gear_size, :automatic_updates,
+                  :version, :license, :website, :description
 
       def scalable?
         supported_scales_to != supported_scales_from
@@ -31,6 +32,10 @@ module RHC
         v
       end
 
+      def external?
+        tags.include?('external')
+      end
+
       def shares_gears?
         Array(collocated_with).present?
       end