openshift-origin-console 1.3.2 → 1.3.3

data/app/assets/stylesheets/_custom.scss

@@ -32,9 +32,6 @@ textarea:focus {
   @include box-shadow(0);
 	}
 
-.form-actions {
-	background-color: none;
-	}
 .side-block {
 	margin-top: 5px;
   margin-bottom: 0;

data/app/assets/stylesheets/_forms.scss

@@ -54,7 +54,7 @@ textarea {
 // Identify controls by their labels
 label {
   display: block;
-  margin-bottom: 5px;
+  margin-bottom: 2px;
   color: $grayDark;
 }
 
@@ -387,11 +387,8 @@ textarea:focus:required:valid {
 // ------------
 
 .form-actions {
-  padding: ($baseLineHeight - 1) 20px $baseLineHeight;
-  margin-top: $baseLineHeight;
-  margin-bottom: $baseLineHeight;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
+  margin-bottom: 0;
+  padding: 15px 0 10px;
   @include clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
 
@@ -471,7 +468,7 @@ textarea:focus:required:valid {
   }
   .add-on,
   .btn {
-    vertical-align: top;
+    vertical-align: bottom;
     @include border-radius(0);
   }
   .active {
@@ -510,6 +507,7 @@ textarea:focus:required:valid {
   select,
   .uneditable-input {
     @include border-radius(0);
+    border-right: 0;
   }
   .add-on:first-child,
   .btn:first-child {
@@ -535,6 +533,10 @@ textarea:focus:required:valid {
   @include clearfix();
 }
 
+// Overide assigned error state styles from bootstrap
+.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
+  color: inherit !important;
+}
 
 
 // SEARCH FORM
@@ -635,7 +637,7 @@ input.search-query {
 
 // Margin to space out fieldsets
 .control-group {
-  margin-bottom: $baseLineHeight / 2;
+  margin-bottom: $baseLineHeight / 1.5;
 }
 
 // Legend collapses margin, so next element is responsible for spacing
@@ -699,6 +701,9 @@ legend + .control-group {
     font-size: floor($baseFontSize + 1);
     padding: 8px 10px;
   }
+  label.control-label, label {
+    font-size: floor($baseFontSize + 1);
+  }
   .add-on.middle {
     padding-left: 0;
     padding-right: 0;

data/app/assets/stylesheets/_variables.scss

@@ -129,3 +129,12 @@ $horizontalComponentOffset:     180px !default; /* Horizontal forms & lists */
 // -------------------------
 $placeholderText:         $grayLight !default;
 
+// Console
+// -------------------------
+
+$consoleBackground:              #1F1F1F;
+$consoleTableBorderColor:        #383838;
+$consoleTableStriped:            rgba(255,255,255,0.02);
+$consoleTableStripedHover:            rgba(255,255,255,0.04);
+
+

data/app/assets/stylesheets/console/_application.scss

@@ -179,7 +179,7 @@
     border-top-color: white;
   }
   .dropdown-toggle {
-    @include box_shadow;
+    @include box-shadow;
   }
   &.open .dropdown-menu { 
     border-radius: 0; 
@@ -187,8 +187,23 @@
 }
 
 @media (max-width: 479px) {
-    #new_application .controls input {
-        width: 95px;
+
+  #new_application .controls {
+    .add-on, .add-on {
+      clear: left;
+      display: block;
+      padding: 8px 0;
+      width: 100% !important;
+    }
+    .add-on.middle {display: none;}
+    .input-prepend, .input-append,
+    .input-prepend input, .input-append input,
+    .input-prepend input, .input-append input {
+      display: block;
+      text-align: center;
+      width: 100%;
+      vertical-align: bottom;
     }
+  }  
 }
 

data/app/assets/stylesheets/console/_core.scss

@@ -1,7 +1,3 @@
-html {
-  background: #101010;
-}
-
 .alert {
   word-wrap: break-word;
   text-shadow: none;
@@ -37,82 +33,6 @@ html {
   color: #cfcfcf;
   }
 
-
-// Forms
-// ----------------------------------------
-
-input,
-select, 
-textarea,
-.uneditable-input {
-  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.075) inset;
-  background: #aaa;
-  border: 1px solid #222;
-  color: #222222;
-	}
-  input:focus, select:focus, textarea:focus {
-    background: #eee; color: #000;
-    box-shadow: none;
-    }
-.input-prepend-append {
-  @include clearfix()
-}
-.input-prepend-append .add-on-first,
-.input-prepend-append .add-on-last,
-.input-prepend-append .add-on-middle {
-    background-color: #444;
-    border: 1px solid #222;
-    text-shadow: none;
-    float: left;
-    }
-.input-prepend-append .add-on-first {border-right: 0;@include border-radius($inputBorderRadius 0 0 $inputBorderRadius);margin-right: -1px;}
-.input-prepend-append .add-on-last {border-left: 0;@include border-radius(0 $inputBorderRadius $inputBorderRadius 0);margin-left: -1px;}
-.input-prepend-append input {
-    color: #000;
-}
-.input-prepend-append input,
-.input-prepend-append .add-on-middle {
-    border-top: 1px solid #222;
-    border-bottom: 1px solid #222;
-    margin-bottom: 0;
-    border-radius: 0;
-    border-left: 0;
-    border-right: 0;
-    float: left;
-    }
-
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: $grayMedium;
-  background-color: $grayLight;
-  &:focus {
-    color: $grayLight;
-    background-color: $grayLighter;
-  }
-}
-
-input:-ms-input-placeholder,
-textarea:-ms-input-placeholder {
-  color: $grayMedium;
-  background-color: $grayLight;
-  &:focus {
-    color: $grayLight;
-    background-color: $grayLighter;
-  }
-}
-
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  color: $grayMedium;
-  //background-color: $grayLight;
-  &:focus {
-    color: $grayLight;
-    //background-color: $grayLighter;
-  }
-}
-
-
-
 .console-inner-block {
     background: #222222;
     color: #B0B0B0;
@@ -148,18 +68,10 @@ input[type="radio"], input[type="checkbox"],input[type="image"] {
 }
 */
 
-::-moz-selection {background: #f0f392;color: black;}
-::-selection {background: #f0f392;color: black;}
-
 .well {
   background-color: #242424 /*.*/;
 }
-code, pre {
-  background-color: inherit;
-  border: 1px dotted #444;
-  border-radius: 0 0 0 0;
-  color: #babbbc;
-  }
+
 ol.wizard {
   margin: 0 0 15px 5px;
   display: block;
@@ -444,10 +356,8 @@ figure {
 
 .form-actions {
     background-color: transparent;
-    border-top: 1px solid #333333;
-    margin-bottom: 18px;
-    margin-top: 18px;
-    padding: 17px 20px 18px;
+    border-top: 0;
+    padding-top: 0;
 }
 
 a.console-link {
@@ -773,9 +683,6 @@ $cartridgeBorderWidth: 10px;
     padding-left: 0 !important;
     display:block;
     }
-  .control-group-important .input-prepend-append .add-on-first, .control-group-important .input-prepend-append .add-on-last, .control-group-important .input-prepend-append .add-on-middle, .control-group-important .input-prepend-append input, .control-group-important .input-prepend-append input {
-    font-size: inherit;
-     }
 
   #account-digest {
     @include expand_for_phone(false);
@@ -876,47 +783,6 @@ $cartridgeBorderWidth: 10px;
 
 .control-group.error p+p {padding-left: 100px;}
 
-/* table customization
------------------------------------------------*/
-
-.table {
-  th,
-  td {
-    border-color: #383838;
-  }
-  // Account for multiple tbody instances
-  tbody + tbody {
-    border-color: #383838;
-  }
-}
-
-.table-bordered {
-  border-color: #383838;
-  th + th,
-  td + td,
-  th + td,
-  td + th {
-    border-color: #383838;
-  }
-}
-
-
-.table-striped {
-  tbody {
-    tr:nth-child(odd) td,
-    tr:nth-child(odd) th {
-      background-color: rgba(255,255,255,0.02);
-    }
-  }
-}
-.table {
-  tbody tr:hover td,
-  tbody tr:hover th {
-    background-color: rgba(255,255,255,0.04);
-  }
-}
-
-.ie9 .table-fixed, .ie8 .table-fixed, .ie7 .table-fixed { table-layout: fixed } // allow td text-overflow
 
 .sshkey-name {
   max-width: 80px;
@@ -932,7 +798,7 @@ $cartridgeBorderWidth: 10px;
   white-space: nowrap;
 }
 
-
+.ie9 .table-fixed, .ie8 .table-fixed, .ie7 .table-fixed { table-layout: fixed } // allow td text-overflow
 
 
 

data/app/controllers/applications_controller.rb

@@ -149,11 +149,7 @@ class ApplicationsController < ConsoleController
     if @application.save
       messages = @application.remote_results
 
-      if t = @application_type.template
-        messages << t.credentials_message if t.credentials
-      end
-
-      redirect_to get_started_application_path(@application, :wizard => true, :template => (@application_type.template.present? || nil)), :flash => {:info_pre => messages}
+      redirect_to get_started_application_path(@application, :wizard => true), :flash => {:info_pre => messages}
     else
       logger.debug @application.errors.inspect
 
@@ -177,7 +173,6 @@ class ApplicationsController < ConsoleController
     @application = @domain.find_application params[:id]
 
     @wizard = !params[:wizard].nil?
-    @template = !params[:template].nil?
     sshkey_uploaded?
   end
 end

data/app/helpers/console/layout_helper.rb

@@ -209,7 +209,7 @@ module Console::LayoutHelper
     items.map{ |c| capture_haml{ yield c }.strip }.to_sentence.html_safe
   end
 
-  HIDDEN_TAGS = [:featured, :framework, :web_framework, :experimental, :in_development, :template, :cartridge]
+  HIDDEN_TAGS = [:featured, :framework, :web_framework, :experimental, :in_development, :cartridge]
   IMPORTANT_TAGS = [:new, :premium]
 
   def application_type_tags(tags)

data/app/helpers/console/model_helper.rb

@@ -66,12 +66,12 @@ module Console::ModelHelper
   end
 
   def can_scale_application_type(type, capabilities)
-    type.scalable? and capabilities.gears_free >= 2 and !type.template?
+    type.scalable? and capabilities.gears_free >= 2
   end
 
   def cannot_scale_title(type, capabilities)
     unless can_scale_application_type(type, capabilities)
-      if type.scalable? and !@application_type.template
+      if type.scalable?
         "You need at least two free gears to create a scaling application; you are currently using #{capabilities.consumed_gears} out of #{capabilities.max_gears}."
       else
         "This application shares resources and can't be scaled."
@@ -96,7 +96,7 @@ module Console::ModelHelper
           [tag, types]
         end
       end
-    end.compact!
+    end.compact
     [groups, other]
   end
 

data/app/models/application_type.rb

@@ -19,7 +19,6 @@ class ApplicationType
 
   attr_accessor :id, :display_name, :version, :description
   attr_accessor :cartridges, :initial_git_url, :initial_git_branch, :cartridges_spec
-  attr_accessor :template # DEPRECATED
   attr_accessor :website, :license, :license_url
   attr_accessor :tags, :learn_more_url
   attr_accessor :help_topics
@@ -91,14 +90,12 @@ class ApplicationType
 
   def source_priority
     case source
-    when :template; -1
     when :cartridge; -2
     else; 0
     end
   end
 
   def cartridge?; source == :cartridge; end
-  def template?; source == :template; end
   def quickstart?; source == :quickstart; end
 
   def matching_cartridges
@@ -106,13 +103,9 @@ class ApplicationType
   end
 
   def >>(app)
-    if template
-      app.template = template.uuid
-    else
-      app.cartridges = cartridges if cartridges.present?
-      app.initial_git_url = initial_git_url if initial_git_url
-      app.initial_git_branch = initial_git_branch if initial_git_branch
-    end
+    app.cartridges = cartridges if cartridges.present?
+    app.initial_git_url = initial_git_url if initial_git_url
+    app.initial_git_branch = initial_git_branch if initial_git_branch
     app
   end
 
@@ -178,7 +171,6 @@ class ApplicationType
         case (match = /^([^!]+)!(.+)/.match(id) || [])[1]
         when 'quickstart'; from_quickstart(Quickstart.find match[2])
         when 'cart'; from_cartridge_type(CartridgeType.cached.find match[2])
-        when 'template'; from_application_template(ApplicationTemplate.cached.find match[2])
         else raise NotFound.new(id)
         end
         #find_every(*arguments).find{ |t| t.id == id } or raise NotFound, id
@@ -192,18 +184,15 @@ class ApplicationType
         when opts[:search]
           query = opts[:search].downcase
           types.concat CartridgeType.cached.standalone
-          types.concat ApplicationTemplate.cached.all
           types.keep_if &LOCAL_SEARCH.curry[query]
           types.concat Quickstart.search(query)
         when opts[:tag]
           tag = opts[:tag].to_sym rescue (return [])
           types.concat CartridgeType.cached.standalone
-          types.concat ApplicationTemplate.cached.all unless tag == :cartridge
           types.keep_if &TAG_FILTER.curry[[tag]]
           types.concat Quickstart.search(tag.to_s) unless tag == :cartridge
         else
           types.concat CartridgeType.cached.standalone
-          types.concat ApplicationTemplate.cached.all
           types.concat Quickstart.cached.promoted
         end
         raise "nil types" unless types
@@ -212,7 +201,6 @@ class ApplicationType
           not (t.tags.include?(:blacklist) or (Rails.env.production? and t.tags.include?(:in_development)))
         end.map do |t|
           case t
-          when ApplicationTemplate; from_application_template(t)
           when CartridgeType; from_cartridge_type(t)
           when Quickstart; from_quickstart(t)
           end
@@ -228,14 +216,6 @@ class ApplicationType
 
         new(attrs, type.persisted?)
       end
-      def from_application_template(type)
-        attrs = { :id => "template!#{type.name}", :source => :template }
-        [:display_name, :tags, :description, :website, :version, :template, :cartridges, :scalable, :initial_git_url, :initial_git_branch].each do |m|
-          attrs[m] = type.send(m)
-        end
-
-        new(attrs, type.persisted?)
-      end
       def from_quickstart(type)
         attrs = { :id => "quickstart!#{type.id}", :source => :quickstart }
         [:display_name, :tags, :description, :website, :initial_git_url, :initial_git_branch, :cartridges_spec, :priority, :scalable, :learn_more_url].each do |m|

data/app/models/quickstart.rb

@@ -41,14 +41,8 @@ class Quickstart < RestApi::Base
     entity_decoded(attributes[:cartridges])
   end
 
-  # This is a short-term fix for BZ877849
-  # The drupal quickstart nodes need to be augmented with a flag to
-  # indicate whether or not they can be scaled.
-  NON_SCALABLE = Regexp.new(['wordpress','drupal','spring','capedwarf','javaee'].join('|'),true)
   def scalable
-    retval = !self.name.match(NON_SCALABLE)
-  ensure
-    Rails.logger.debug("Handling #{self.name} quickstart as non-scalable") unless retval
+    (not tags.include?(:not_scalable) rescue true)
   end
   alias_method :scalable?, :scalable
 

data/app/views/application_types/show.html.haml

@@ -20,7 +20,6 @@
     #new_application.form-horizontal .control-label { margin-left: 0; }
     #new_application.form-horizontal .controls { margin-left: 0; }
     #new_application.form-horizontal .help-block { max-width: inherit; white-space: normal; }
-    #new_application.form-horizontal .controls input { display: inline; }
     #new_application.form-horizontal .controls > h3 { display: inline-block; margin-top: 0; }
     #new_application.form-horizontal .form-actions { padding-left: 10px; }
   }
@@ -101,8 +100,9 @@
       .controls
         %p.help-block 
           - if @application_type.initial_git_url || @advanced
-            Your application will start with a copy of the code and configuration provided in 
-            this Git repository.
+            Your application will start with an exact copy of the code and configuration provided in 
+            this Git repository. OpenShift may expect certain files to exist in certain directories,
+            which may require you to update your repository after creation.
           - else
             We'll create a Git code repository in the cloud, and populate it with a set of 
             reasonable defaults. 
@@ -181,16 +181,6 @@
           - else
             %span.text-warning= scale_reason
 
-    .control-group
-      .controls
-        - if @application_type.template
-          %p.text-warning
-            After creation, check the repository README for any manual configuration 
-            required to secure this application.
-
-          %p
-            %em Note: It may take up to a minute to deploy your application
-
   = f.buttons do
     = link_to "Back", application_types_path, :class => 'btn'
     = f.commit_button :button_html => { :disabled => @disabled } 

data/app/views/applications/_name.html.haml

@@ -1,27 +1,27 @@
-.input-prepend-append
-  %span.add-on-first http://
+.input-prepend.input-append
+  %span.add-on http://
 
   = form.text_field :name, 
     :value => "#{application.name}", 
     :autofocus => true, 
-    :maxlength => 32, 
+    :size => nil, 
     :placeholder => 'Application name', 
-    :class => "application_name #{'error' if application.errors.include? :name}"
+    :class => "application_name span3 #{'error' if application.errors.include? :name}"
 
   -# If the user has a domain, use it, otherwise prompt them for that field
   - if @domain and @domain.persisted?
 
-    %span.add-on-last> -#{@domain.name}.#{RestApi.application_domain_suffix}
+    %span.add-on> -#{@domain.name}.#{RestApi.application_domain_suffix}
 
   - else
 
-    %span.add-on-middle> –
+    %span.add-on.middle> –
     = form.text_field :domain_name, 
       :value => "#{application.domain_name}", 
       :placeholder => 'Namespace', 
-      :maxlength => 16, 
-      :class => "domain_name #{'error' if application.errors.include? :domain_name}"
-    %span.add-on-last>= ".#{RestApi.application_domain_suffix}"
+      :size => nil, 
+      :class => "domain_name span3 #{'error' if application.errors.include? :domain_name}"
+    %span.add-on>= ".#{RestApi.application_domain_suffix}"
 
 - unless @domain and @domain.persisted?
   %p.help-block

data/app/views/applications/get_started.html.haml

@@ -25,11 +25,6 @@
       - else
         If your application exposes services to the Internet they will be available at
 
-      - if @template
-        .alert.alert-info
-          Your application is currently being created. Preconfigured applications take a little longer to get ready.
-          If you try to access your application and get a 503 error, it means the deployment is in progress.
-
       %p.well.application-url.larger
         = link_to @application.web_url, @application.web_url, :target => '_blank'
 

data/app/views/cartridge_types/show.html.haml

@@ -10,7 +10,7 @@
   = f.hidden_field :type, :value => @cartridge_type.type
   = f.hidden_field :name, :value => @cartridge_type.name
   = f.semantic_errors :name, :cartridge
-  %div
+  %p
     Do you want to add the
     %strong
       #{@cartridge_type.display_name}

data/app/views/cartridges/next_steps.html.haml

@@ -17,7 +17,7 @@
       Most of the capabilities of OpenShift are exposed through our command line tool, <code>rhc</code>.
       Whether it's adding cartridges, checking uptime, or pulling log files from
       the server, you can quickly put a finger on the pulse of your application.
-      #{link_to "Follow these steps to install the client", getting_started_path(:anchor => 'install_client_tools')}
+      #{link_to "Follow these steps to install the client", getting_started_guide_url}
       on Linux, Mac OS X, or Windows.
 
     %p

data/app/views/domains/_form.html.haml

@@ -1,11 +1,11 @@
 = semantic_form_for domain, :url => domain_path, :simple => true do |f|
   = f.semantic_errors :name
   .control-group.control-group-important{:class => domain.errors[:name].present? || domain.errors[:namespace].present? ? 'error' : '', :id => "domain_name_group", :data => domain.errors[:name].present? || domain.errors[:namespace].present? ? {:"server-error" => 'server-error'} : {}}
-    .controls
-      .input-prepend-append
-        %span.add-on-first> http://applicationname–
+    .controls.first
+      .input-prepend.input-append
+        %span.add-on> http://applicationname–
         = f.text_field :name, :autofocus => true, :placeholder => 'Namespace', :class => 'domain_name'
-        %span.add-on-last>= RestApi.application_domain_suffix
+        %span.add-on>= RestApi.application_domain_suffix
       .help-block Your namespace must be letters or numbers with no spaces or symbols.
   = f.buttons do
     = link_to "Cancel", account_path, :class => 'btn'

data/config/cartridge_types.yml

@@ -52,3 +52,7 @@
 - :name: jbossews-1.0
   :categories:
   - :new
+  
+  :name: jbossews-2.0
+  :categories:
+  - :new

data/test/functional/application_types_controller_test.rb

@@ -22,14 +22,6 @@ class ApplicationTypesControllerTest < ActionController::TestCase
     assert groups.first[1].present?
   end
 
-  test "should be able to find templates" do
-    with_unique_user
-    types = ApplicationType.all
-    (templates,) = types.partition{|t| t.template?}
-    omit("No templates have been registered on this server") if templates.empty?
-    assert_not_equal 0, templates.length, "There should be templates to test against"
-  end
-
   test "should be able to find quickstarts" do
     with_unique_user
     types = ApplicationType.all
@@ -62,7 +54,7 @@ class ApplicationTypesControllerTest < ActionController::TestCase
     assert assigns(:application)
     assert assigns(:domain)
     assert css_select('input#application_domain_name').present?
-    if t.tags.include?(:template) or t.id == 'diy-0.1'
+    if t.tags.include?(:not_scalable) or t.id == 'diy-0.1'
       # Sanity-check known non-scalable types
       assert_equal false, t.scalable?
     elsif t.id == 'php-5.3'
@@ -88,15 +80,6 @@ class ApplicationTypesControllerTest < ActionController::TestCase
     assert_standard_show_type(type)
   end
 
-  test "should show type page for application template" do
-    with_unique_user
-    type = ApplicationType.all.select(&:template?).sample(1).first
-    omit("No templates registered on this server") if type.nil?
-
-    get :show, :id => type.id
-    assert_standard_show_type(type)
-  end
-
   test "should handle invalid quickstart page" do
     with_unique_user
     type = Quickstart.new(:id => 'test', :name => '', :cartridges => '[{')

data/test/functional/applications_controller_test.rb

@@ -6,19 +6,6 @@ class ApplicationsControllerTest < ActionController::TestCase
     # in applications_controller_sanity_test
   end
 
-  test 'template create and destroy' do
-    with_unique_domain
-    type = ApplicationType.all.select(&:template?).sample(1).first
-    omit("No templates are installed on this server") if type.nil?
-    post(:create, {:application => get_post_form(type.id)})
-
-    assert app = assigns(:application)
-    assert app.errors.empty?, app.errors.inspect
-    assert app.persisted?, app.inspect
-
-    app.destroy
-  end
-
   test 'should redirect new to types' do
     with_configured_user
     get :new
@@ -271,20 +258,6 @@ class ApplicationsControllerTest < ActionController::TestCase
     assert_select 'h1', /Application 'idontexist' does not exist/
   end
 
-  test 'should combine messages correctly for template creation' do
-    with_unique_domain
-    template = ApplicationType.all.select(&:template?).select{ |t| t.template.credentials_message }.sample(1).first
-    omit("No templates installed on this system") if template.nil?
-    saved = states('saved').starts_as('no')
-    Application.any_instance.expects(:save).returns(true).then(saved.is('yes'))
-    Application.any_instance.expects(:persisted?).at_least_once.returns(false).when(saved.is('no'))
-    Application.any_instance.expects(:persisted?).at_least_once.returns(true).when(saved.is('yes'))
-    Application.any_instance.expects(:remote_results).at_least_once.returns(['message'])
-    post(:create, {:application => get_post_form(template.id)})
-
-    assert_equal ['message', template.template.credentials_message], flash[:info_pre]
-  end
-
   test 'invalid destroy should render page' do
     Application.any_instance.expects(:destroy).returns(false)
     delete :destroy, :id => with_app.name

data/test/integration/rest_api/cartridge_type_test.rb

@@ -67,20 +67,6 @@ class RestApiCartridgeTypeTest < ActiveSupport::TestCase
     log_types(types)
 
     assert types[0].id.starts_with?('cart!jbosseap'), types[0].id
-
-    type = types.find(&:template?)
-    omit("No templates defined on this server") if type.nil?
-
-    template = type.template
-    assert template.name
-    assert template.description
-    assert template.version
-    assert template.website
-    assert template.git_url
-    assert template.git_project_url
-    assert_equal type.id, "template!#{template.name}"
-    assert template.git_project_url
-    assert_same template.tags, template.tags
   end
 
   test 'sort cartridges' do
@@ -121,17 +107,6 @@ class RestApiCartridgeTypeTest < ActiveSupport::TestCase
     assert missing.empty?
   end
 
-  # Currently /application_templates/<string>.json can return an array
-  # if the value is not a properly formatted ID.  This is questionable,
-  # and this test is only to protect us in the case that we have code
-  # depending on that behavior.  If this behavior is moved to a new
-  # route then we can remove this.
-  test 'application template names returned by server' do
-    template = ApplicationTemplate.first(:from => :wordpress)
-    omit("No templates defined on this server") unless template
-    assert_equal 'WordPress', template.display_name
-  end
-
   test 'match cartridges' do
     assert_equal [], CartridgeType.cached.matches('bra').map(&:name)
     assert_equal ['ruby-1.9','ruby-1.8'], CartridgeType.cached.matches('ruby').map(&:name)

data/test/support/base.rb

@@ -35,6 +35,7 @@ class ActiveSupport::TestCase
   def self.uses_http_mock(sym=:always)
     require 'active_resource/persistent_http_mock'
     self.module_eval do
+      setup{ RestApi.stubs(:application_domain_suffix).returns('test.rhcloud.com') }
       setup{ ActiveResource::HttpMock.enabled = true } unless sym == :sometimes
       teardown do
         ActiveResource::HttpMock.reset!

data/test/unit/helpers/model_helper_test.rb

@@ -58,4 +58,19 @@ class Console::ModelHelperTest < ActionView::TestCase
       },
       scale_to_options(stub(:supported_scales_from => 1, :supported_scales_to => -1), 6, 5))
   end
+
+  Tagged = Struct.new(:tags)
+
+  def test_in_groups_by_tag
+    t1 = Tagged.new([:ruby, :php])
+    t2 = Tagged.new([:ruby])
+
+    groups, others = in_groups_by_tag([t1], [:ruby])
+    assert_equal [t1], others
+    assert groups.empty?
+
+    groups, others = in_groups_by_tag([t1, t2], [:ruby])
+    assert_equal [[:ruby, [t1, t2]]], groups
+    assert others.empty?
+  end
 end

data/test/unit/rest_api_test.rb

@@ -999,11 +999,6 @@ class RestApiTest < ActiveSupport::TestCase
     assert_equal false, non_scalable_type.scalable?
   end
 
-  def test_application_template_scalable_check
-    assert app_template = ApplicationTemplate.new
-    assert_equal false, app_template.scalable?
-  end
-
   def test_cartridge_type_find
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get '/broker/rest/cartridges.json', anonymous_json_header, [
@@ -1209,9 +1204,6 @@ class RestApiTest < ActiveSupport::TestCase
         {:name => 'php-5.3', :type => 'standalone', :tags => [:framework]},
         {:name => 'blacklist', :type => 'standalone', :tags => [:framework, :blacklist]},
       ].to_json
-
-      mock.get '/broker/rest/application_templates.json', anonymous_json_header, [
-      ].to_json
     end
 
     # For this test, stub the scalability logic; we test it separately
@@ -1231,54 +1223,6 @@ class RestApiTest < ActiveSupport::TestCase
     assert_raise(ApplicationType::NotFound) { ApplicationType.find('blacklist') }
   end
 
-  def test_application_templates
-    mock_quickstart_disabled
-    ActiveResource::HttpMock.respond_to(false) do |mock|
-      mock.get '/broker/rest/cartridges.json', anonymous_json_header, [
-      ].to_json
-
-      mock.get '/broker/rest/application_templates.json', anonymous_json_header, [
-        { 
-          :name => 'blacklist',
-          :tags => [:framework, :blacklist],
-          :metadata => {},
-          :descriptor_yaml => ''
-        },
-        {
-          :name => 'rails',
-          :tags => [:framework, :ruby, :rails, :in_development],
-          :descriptor_yaml => YAML.dump({
-            'Name' => "rails"
-          }),
-          :metadata => {
-            :attributes => {
-            }.to_json
-          },
-          :display_name => "Ruby on Rails",
-          :uuid => '1234'
-        }
-      ].to_json
-    end
-
-    types = ApplicationType.find :all
-    assert_equal 1, types.length
-
-    assert_equal 'Ruby on Rails', types[0].display_name
-
-    types.each do |type|
-      assert a = ApplicationType.find(type.id)
-      assert_equal type.id, a.id
-      assert_equal type.description, a.description
-      assert_equal type.categories, a.categories
-    end
-
-    assert_raise(ApplicationType::NotFound) { ApplicationType.find('blacklist') }
-
-    # template is in_development and excluded
-    Rails.env.expects(:production?).returns(true)
-    assert ApplicationType.find(:all).empty?
-  end
-
   def test_application_job_url
     a = Application.new :build_job_url => "https://test/test"
     assert_equal 'https://test/test', a.build_job_url
@@ -1417,11 +1361,12 @@ class RestApiTest < ActiveSupport::TestCase
     assert group1.send(:move_features, group2) # nothing is moved, but group1 is still empty and should be purged
   end
 
-  def a_quickstart
+  def a_quickstart(additional_tags=[])
+    tags = ["blog", "instant_app", "php", "wordpress"].concat(additional_tags).join(", ")
     quickstart = {data:[
       {quickstart:{
         body:"<p>An awesome blog hosting platform with a rich ecosystem<\/p>",
-        summary:"An awesome blog hosting platform with a rich ecosystem",
+        summary: "An awesome blog hosting platform with a rich ecosystem",
         id:"12069",
         href:"\/community\/content\/wordpress-34",
         name:"Wordpress 3.4",
@@ -1429,17 +1374,17 @@ class RestApiTest < ActiveSupport::TestCase
         cartridges:"php-5.3, mysql-5.1",
         initial_git_url:"https:\/\/github.com\/openshift\/wordpress-example",
         language:"PHP",
-        tags:"blog, instant_app, php, wordpress",
+        tags: tags,
         website:"https:\/\/www.wordpress.org"
       }}
     ]}
   end
 
-  def mock_quickstart
+  def mock_quickstart(additional_tags=[])
     Quickstart.reset!
     RestApi.reset!
 
-    quickstart = a_quickstart
+    quickstart = a_quickstart(additional_tags)
 
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get '/broker/rest/api.json', anonymous_json_header, {:data => {
@@ -1525,6 +1470,7 @@ class RestApiTest < ActiveSupport::TestCase
     assert q = Quickstart.promoted.first
     assert_equal "Wordpress 3.4", q.name
     assert_equal "12069", q.id
+    assert q.scalable?
     assert q.website
     assert_equal 'php-5.3, mysql-5.1', q.cartridges_spec
     assert q.initial_git_url
@@ -1532,6 +1478,14 @@ class RestApiTest < ActiveSupport::TestCase
     assert q.updated > 1.year.ago
   end
 
+  def test_non_scalable_quickstarts
+    mock_quickstart(['not_scalable'])
+
+    assert_equal 1, Quickstart.promoted.length
+    assert q = Quickstart.promoted.first
+    assert_equal false, q.scalable?
+  end
+
   def test_quickstart_disabled
     mock_quickstart_disabled
     assert Quickstart.disabled?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openshift-origin-console
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Clayton Coleman
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-18 00:00:00 -05:00
+date: 2013-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,7 +125,6 @@ files:
 - README.md
 - Rakefile
 - app/views/shared/_tracking.html.haml
-- app/views/application_templates/_application_template.html.haml
 - app/views/account/_domain.html.haml
 - app/views/account/_user.html.haml
 - app/views/account/show.html.haml
@@ -181,7 +180,6 @@ files:
 - app/models/application_associations.rb
 - app/models/rest_api.rb
 - app/models/alias.rb
-- app/models/application_template.rb
 - app/models/rest_api/log_subscriber.rb
 - app/models/rest_api/cacheable.rb
 - app/models/rest_api/railties/controller_runtime.rb

data/app/models/application_template.rb

@@ -1,90 +0,0 @@
-class ApplicationTemplate < RestApi::Base
-  allow_anonymous
-
-  schema do
-    string :descriptor_yaml, :display_name
-  end
-
-  custom_id :name
-
-  [:description, :website, :version, :git_url, :git_project_url].each do |s|
-    define_attribute_method s
-    define_method s do
-      metadata.attributes[s]
-    end
-  end
-  {:name => 'Name', :provides => 'Requires'}.each_pair do |s,v|
-    define_attribute_method s
-    define_method s do
-      descriptor[v]
-    end
-  end
-
-  def descriptor
-    @descriptor ||= YAML.load(descriptor_yaml) || {}
-  end
-
-  def display_name
-    attributes['display_name'] || name
-  end
-  def tags
-    @tags ||= super.map{|t| t.to_sym} << :template
-  end
-  alias_method :categories, :tags
-
-  def provides
-    Array(super)
-  end
-
-  def template
-    self
-  end
-
-  def credentials
-    creds = metadata.attributes[:credentials]
-    creds.map{|x| x.attributes.to_hash } unless creds.nil?
-  end
-
-  def credentials_message
-    creds = credentials
-    return if creds.blank?
-
-    str =  "Your application contains pre-configured accounts, here are their credentials. " +
-           "You may want to change them as soon as possible.\n"
-
-    credentials.each do |cred|
-      str << "\n"
-      [:username, :password].each do |type|
-        str << "%s: %s\n" % [type.to_s.upcase,cred[type.to_s]]
-      end
-    end
-
-    str
-  end
-
-  def scalable
-    false
-  end
-  alias_method :scalable?, :scalable
-
-  def cartridges
-    @cartridges ||= descriptor['Requires'] || []
-  end
-
-  alias_method :initial_git_url, :git_url
-  def initial_git_branch
-    nil
-  end
-
-  cache_find_method :single, lambda{ |*args| [:template, :find, :by_id, args.shift] }
-  cache_find_method :every
-
-  protected
-    def self.find_single(s, opts=nil)
-      all(opts).find{ |t| t.name == s }
-    end
-
-    def self.disabled?
-      !RestApi.info.link('LIST_TEMPLATES') rescue true
-    end
-end

data/app/views/application_templates/_application_template.html.haml

@@ -1,5 +0,0 @@
-%section
-  %p
-    Based on: #{link_to application_template.git_project_url, application_template.git_project_url, :target => "_blank"}.<br /> 
-    %strong Note:
-    check the repository README file for any additional instructions.