Merge pull request #228 from mezuro/process_by_branch

Process by branch

Merge pull request #228 from mezuro/process_by_branch
Process by branch
marcheing
2 parents 0995444d 191007b5
Showing 18 changed files with 251 additions and 33 deletions Show diff stats
.travis.yml
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/repository.js.coffee
app/assets/javascripts/repository/branch.js.coffee
app/assets/javascripts/repository/state.js.coffee
app/controllers/repositories_controller.rb
app/views/repositories/_form.html.erb
app/views/repositories/reload_processing.js.erb
app/views/repositories/show.html.erb
config/locales/views/repository/en.yml
config/locales/views/repository/pt.yml
config/routes.rb
features/repository/create.feature
spec/controllers/repositories_controller_spec.rb
spec/javascripts/repository/branch_spec.js.coffee
spec/routing/repositories_routing_spec.rb
@@ -5,7 +5,7 @@ addons:
   postgresql: "9.3"
  
 before_script:
-  - git clone https://github.com/mezuro/kalibro_install.git -b v2.3 kalibro_install
+  - git clone https://github.com/mezuro/kalibro_install.git -b v2.5 kalibro_install
   - pushd kalibro_install
     # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
   - sudo apt-get remove libzmq3
@@ -31,7 +31,7 @@ gem &#39;jbuilder&#39;, &#39;~&gt; 2.2.2&#39;
 gem 'devise', '~> 3.4.0'
  
 # Kalibro integration
-gem 'kalibro_client'
+gem 'kalibro_client', '~> 0.3.0'
  
 # PostgreSQL integration
 gem "pg", "~> 0.18.1"
@@ -113,6 +113,9 @@ group :development, :test do
   gem 'i18n_generators'
  
   gem 'sprockets', '~>2.12.3' # spckets 3.0.3 breaks konacha
+
+  # Mocks and stubs for javascript tests
+  gem 'sinon-rails'
 end
  
 # Acceptance tests
@@ -156,8 +156,8 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
-    json (1.8.2)
-    kalibro_client (0.1.1)
+    json (1.8.3)
+    kalibro_client (0.3.0)
       activesupport (>= 2.2.1)
       faraday_middleware (~> 0.9.0)
     konacha (3.3.0)
@@ -190,7 +190,7 @@ GEM
     metaclass (0.0.4)
     mime-types (2.5)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.0)
@@ -277,6 +277,8 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    sinon-rails (1.15.0)
+      railties (>= 3.1)
     spring (1.3.6)
     sprockets (2.12.3)
       hike (~> 1.2)
@@ -349,7 +351,7 @@ DEPENDENCIES
   jbuilder (~> 2.2.2)
   jquery-rails
   jquery-ui-rails (~> 5.0.0)
-  kalibro_client
+  kalibro_client (~> 0.3.0)
   konacha (~> 3.3.0)
   mocha
   pg (~> 0.18.1)
@@ -361,6 +363,7 @@ DEPENDENCIES
   sdoc (~> 0.4.0)
   shoulda-matchers (~> 2.8.0)
   simplecov
+  sinon-rails
   spring
   sprockets (~> 2.12.3)
   sqlite3
@@ -16,6 +16,7 @@
 //= require twitter/bootstrap
 //= require turbolinks
 //= require modules
+//= require repository
 //= require Chart
 //= require_tree .
 //= require colorpicker
-class Module.Repository
-  constructor: (@project_id, @repository_id) ->
-
-  poll_state: (last_state) ->
-    $.post '/projects/' + @project_id + '/repositories/' + @repository_id + '/state',
-          last_state: last_state
-
-  schedule_poll_state: (last_state) ->
-    context = this
-    call = () ->
-              context.poll_state(last_state)
-
-    setTimeout( call, 15000 ) # Delays in 15s the next call
-
-  @set_loader: (loading_html) ->
-    $('div#processing_information').html(loading_html)
+@Repository = {}
@@ -0,0 +1,57 @@
+class Repository.Branch
+  constructor: ->
+    @names = {}
+    @request = null
+
+  toggle: ->
+    if $("#repository_scm_type").val() != "SVN"
+      $("#branches").show()
+      @fetch($("#repository_address").val())
+    else
+      $("#branches").hide()
+
+  cancel_request: ->
+    if @request != null
+      @request.abort()
+      @request = null
+
+  fill_options: (options, el) ->
+    # FIXME: this works only if master is the default branch
+    #        it can be improved by moving it into KalibroProcessor
+    default_branch = "master"
+    if default_branch in options
+      # Brings the default branch as the first option
+      index = options.indexOf(default_branch)
+      options.splice(index, 1)
+      options.unshift(default_branch)
+    for option in options
+      do ->
+        el.append($("<option></option>")
+          .attr("value", option)
+          .text(option))
+
+  fetch: (address) ->
+    @cancel_request()
+
+    # Prevent a call with blank address
+    if address == ""
+      return
+
+    branches_select_box = $("#repository_branch")
+    branches_select_box.empty() # remove old options
+
+    if @names[address]?
+      @fill_options(@names[address], branches_select_box)
+      return
+
+    scm_type = $("#repository_scm_type").val()
+
+    context = this
+    @request = $.get '/repository_branches',
+      {'url': address, 'scm_type': scm_type},
+      (data) ->
+        unless data["errors"]
+          options = data["branches"]
+          if options != null
+            context.names[address] = options
+            context.fill_options(options, branches_select_box)
@@ -0,0 +1,16 @@
+class Repository.State
+  constructor: (@project_id, @repository_id) ->
+
+  poll_state: (last_state) ->
+    $.post('/projects/' + @project_id + '/repositories/' + @repository_id + '/state',
+           last_state: last_state)
+
+  schedule_poll_state: (last_state) ->
+    context = this
+    call = () ->
+      context.poll_state(last_state)
+
+    setTimeout(call, 15000) # Delays in 15s the next call
+
+  @set_loader: (loading_html) ->
+    $('div#processing_information').html(loading_html)
 \ No newline at end of file
@@ -84,6 +84,15 @@ class RepositoriesController &lt; ApplicationController
     end
   end
  
+  def branches
+    branch_params = branches_params
+    branches_list = Repository.branches(branch_params[:url], branch_params[:scm_type])
+
+    respond_to do |format|
+      format.json { render json: branches_list }
+    end
+  end
+
 private
   def set_project_id_repository_types_and_configurations
     @project_id = params[:project_id]
@@ -119,6 +128,10 @@ private
     params[:repository]
   end
  
+  def branches_params
+    params.permit(:scm_type, :url)
+  end
+
   # Code extracted from create action
   def create_and_redir(format)
     if @repository.save
@@ -43,7 +43,7 @@
     <div class="form-row">
       <div class="field-container">
         <%= f.label :scm_type, class: 'control-label' %>
-        <%= f.select( :scm_type, @repository_types, class: 'tooltip-control' ) %>
+        <%= f.select( :scm_type, @repository_types, {}, class: 'tooltip-control', onchange: "_repository_branch.toggle();" ) %>
       </div>
       <div class="help-container">
         <p>
@@ -55,7 +55,7 @@
     <div class="form-row">
       <div class="field-container">
         <%= f.label :address, class: 'control-label' %>
-        <%= f.text_field :address, :required => true, class: 'text-field form-control' %>
+        <%= f.text_field :address, :required => true, class: 'text-field form-control', onchange: "_repository_branch.fetch(this.value);" %>
       </div>
       <div class="help-container">
         <p>
@@ -64,6 +64,20 @@
       </div>
     </div>
  
+    <div id="branches">
+      <div class="form-row">
+        <div class="field-container">
+          <%= f.label :branch, class: 'control-label' %>
+          <%= f.select :branch, []%>
+        </div>
+        <div class="help-container">
+          <p>
+            <%= t('activemodel.hints.repository.address') %>
+          </p>
+        </div>
+      </div>
+    </div>
+
     <div class="form-row">
       <div class="field-container">
         <%= f.label :period, class: 'control-label' %>
@@ -94,3 +108,11 @@
   <%= f.submit t('save'), class: 'btn btn-primary' %>
   <%= link_to t('back'),  project_path(@project_id), class: 'btn btn-default' %>
 </div>
+
+<script type="text/javascript">
+  var _repository_branch = new Repository.Branch;
+
+  $(document).on('page:load ready', function() {
+    _repository_branch.toggle();
+  });
+</script>
@@ -7,6 +7,6 @@ current_path = current_path_splited.join(&quot;/&quot;);
 // This if prevents it from updating the repository's state after the user leaves its page
 if(current_path == '<%= project_repository_path(project_id: @repository.project_id, id: @repository, locale: nil) %>'){
   $('div#processing_information').html('<%= escape_javascript(render partial: "processing_information") %>');
-  repository = new Module.Repository(<%= @repository.project_id %>, <%= @repository.id %>)
+  repository = new Repository.State(<%= @repository.project_id %>, <%= @repository.id %>)
   repository.schedule_poll_state('<%= @processing.state %>')
 }
@@ -23,6 +23,11 @@
 </p>
  
 <p>
+  <strong><%= Repository.human_attribute_name('branch') %>:</strong>
+  <%= @repository.branch %>
+</p>
+
+<p>
   <strong><%= Repository.human_attribute_name('period') %>:</strong>
   <%= periodicity_option(@repository.period) %>
 </p>
@@ -42,7 +47,7 @@
     <%= select_tag(:month, options_for_select(month_options), :style => "width:55px; margin-top:5px") %>
     <%= label_tag :year, t("year") %>:
     <%= select_tag(:year, options_for_select(year_options), :style => "width:70px; margin-top:5px") %>
-    <%= submit_tag(t('search'), class: 'btn btn-info', style: 'margin-bottom:5px', onClick: "Module.Repository.set_loader('#{image_tag 'loader.gif'} Loading data. Please, wait.')") %>
+    <%= submit_tag(t('search'), class: 'btn btn-info', style: 'margin-bottom:5px', onClick: "Repository.State.set_loader('#{image_tag 'loader.gif'} Loading data. Please, wait.')") %>
   </p>
 <% end %>
  
@@ -66,7 +71,7 @@
 </div>
 <script type="text/javascript">
     $(document).ready(function () {
-      (new Module.Repository(<%= @repository.project_id %>, <%= @repository.id %>)).poll_state('')
+      (new Repository.State(<%= @repository.project_id %>, <%= @repository.id %>)).poll_state('')
     });
  
   //Loads the accordion
@@ -12,6 +12,7 @@ en:
         scm_type: "Type"
         address: "Address"
         period: "Process Period"
+        branch: "Branch"
     hints:
       repository:
         name: "The name of your Repository."
@@ -21,6 +22,7 @@ en:
         address: "The URL where the Repository is located."
         period: "Select how often the Repository will be reprocessed."
         kalibro_configuration: "A %{configuration_href} defines all the metrics to be calculated in the source code. Choose your weapon!"
+        branch: "The branch to be analyzed."
     errors:
       repository:
         no_metric_results: "Repository process returned with error. There are no metric results."
@@ -33,4 +35,4 @@ en:
       modules_tree: "Modules Tree"
       metric_results: "Metric Results"
       loading: "Loading data. Please, wait."
-      date_processing: "Retrieve the closest processing information from"
 \ No newline at end of file
+      date_processing: "Retrieve the closest processing information from"
@@ -12,6 +12,7 @@ pt:
         scm_type: "Tipo"
         address: "Endereço"
         period: "Período"
+        branch: "Ramo"
     hints:
       repository:
         name: "O nome do seu Repositório."
@@ -21,6 +22,7 @@ pt:
         address: "A URL onde o respositório está acessível."
         period: "Selecione o quão frequentemente o repositório será reprocessado."
         kalibro_configuration: "Uma %{configuration_href} define todas as métricas a serem extraídas do códifo-fonte."
+        branch: "O ramo que será analisado."
     errors:
       repository:
         no_metric_results: "O processamento do Repósitório retornou um erro. Não há Resultados de Métrica."
@@ -33,4 +35,4 @@ pt:
       modules_tree: "Árvore de Módulos"
       metric_results: "Resultados de Métrica"
       loading: "Carregando os dados. Por favor, aguarde."
-      date_processing: "Obtenha a informação de processamento mais próxima a"
 \ No newline at end of file
+      date_processing: "Obtenha a informação de processamento mais próxima a"
@@ -12,6 +12,8 @@ Rails.application.routes.draw do
       get '/repositories/:id/process' => 'repositories#process_repository', as: :repository_process
     end
  
+    get '/repository_branches' => 'repositories#branches', as: :repository_branches
+
     resources :kalibro_configurations do
       get '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric
       resources :metric_configurations, except: [:update, :new] do
@@ -13,8 +13,12 @@ Scenario: repository creation
   And I fill the Name field with "Kalibro"
   And I fill the Description field with "Description"
   And I set the select field "License" as "ISC License (ISC)"
-  And I set the select field "Type" as "GIT"
-  And I fill the Address field with "https://github.com/mezuro/kalibro_gem.git"
+  When I set the select field "Type" as "SVN"
+  Then I should not see "Branch"
+  When I set the select field "Type" as "GIT"
+  Then I should see "Branch"
+  Given I fill the Address field with "https://github.com/mezuro/kalibro_client.git"
+  And I set the select field "Branch" as "master"
   And I set the select field "Process Period" as "1 day"
   And I set the select field "Configuration" as "Java"
   When I press the Save button
@@ -48,8 +52,8 @@ Scenario: repository creation with name already taken
   And I fill the Name field with "KalibroEntities"
   And I fill the Description field with "Description"
   And I set the select field "License" as "ISC License (ISC)"
+  And I fill the Address field with "https://github.com/mezuro/kalibro_client.git"
   And I set the select field "Type" as "GIT"
-  And I fill the Address field with "https://github.com/mezuro/kalibro_gem.git"
   And I set the select field "Process Period" as "1 day"
   And I set the select field "Configuration" as "Java"
   When I press the Save button
@@ -65,8 +69,8 @@ Scenario: Repository name with whitespaces
   And I am at the New Repository page
   And I fill the Name field with "   Kalibro Entities  "
   And I set the select field "License" as "ISC License (ISC)"
+  And I fill the Address field with "https://github.com/mezuro/kalibro_client.git"
   And I set the select field "Type" as "GIT"
-  And I fill the Address field with "https://github.com/mezuro/kalibro_gem.git"
   And I set the select field "Process Period" as "1 day"
   And I set the select field "Configuration" as "Java"
   When I press the Save button
@@ -347,4 +347,67 @@ describe RepositoriesController, :type =&gt; :controller do
       end
       it { is_expected.to redirect_to(project_repository_path(repository.project_id, repository.id)) }
   end
+
+  describe 'branches' do
+    let(:url) { "dummy-url" }
+    let(:scm_type) { "GIT" }
+
+    context 'valid parameters' do
+      let!(:branches) { ['branch1', 'branch2'] }
+
+      before :each do
+        sign_in FactoryGirl.create(:user)
+        Repository.expects(:branches).with(url, scm_type).returns(branches: branches)
+        get :branches, url: url, scm_type: scm_type, format: :json
+      end
+
+      it 'is expected to return a list of branches' do
+        expect(JSON.parse(response.body)).to eq(JSON.parse({branches: branches}.to_json))
+      end
+
+      it { is_expected.to respond_with(:success) }
+    end
+
+    context 'invalid parameters' do
+      before :each do
+        sign_in FactoryGirl.create(:user)
+        Repository.expects(:branches).with(url, scm_type).returns(errors: ['Error'])
+        get :branches, url: url, scm_type: scm_type, format: :json
+      end
+
+      it 'is expected to return an empty list' do
+        expect(JSON.parse(response.body)).to eq(JSON.parse({errors: ['Error']}.to_json))
+      end
+
+      it { is_expected.to respond_with(:success) }
+    end
+  end
+
+  describe 'branches_params' do
+    let!(:url) { 'dummy-url' }
+    let!(:scm_type) { 'GIT' }
+    let(:parameters) { ActionController::Parameters.new(scm_type: scm_type, url: url) }
+
+    context 'valid parameters' do
+      it 'should return a hash with the permitted parameters' do
+        subject.params = parameters
+        expect(subject.params.permitted?).to be_falsey
+        result = subject.send(:branches_params)
+        expect(result).to eq(parameters)
+        expect(result.permitted?).to be_truthy
+      end
+    end
+
+    context 'invalid parameters' do
+      let(:invalid_parameters) { ActionController::Parameters.new(scm_type: scm_type, url: url, something_evil: 'fizzbuzz') }
+
+      it 'should return a valid parameters hash' do
+        subject.params = invalid_parameters
+        expect(subject.params.permitted?).to be_falsey
+        result = subject.send(:branches_params)
+        expect(result).to eq(parameters)
+        expect(result.permitted?).to be_truthy
+      end
+    end
+  end
 end
@@ -0,0 +1,38 @@
+#= require jquery
+#= require repository
+#= require repository/branch
+#= require sinon
+
+describe "Branch#constructor", ->
+  it "should construct a branch", ->
+    subject = new Repository.Branch()
+    subject.names.should.deep.equal({})
+    assert.isNull(subject.request)
+
+describe "toggle", ->
+  before ->
+    @subject = new Repository.Branch()
+
+    @combo_box = sinon.stub()
+    $ = sinon.stub(window, "$")
+    $.withArgs("#branches").returns(@combo_box)
+
+  context "scm_type = SVN", ->
+    before ->
+      @combo_box.hide = sinon.spy()
+      $.withArgs("#repository_scm_type").returns({val: -> "SVN"})
+
+    it "should hide the branches combo box", ->
+      @subject.toggle()
+      assert.isTrue(@combo_box.hide.calledOnce)
+
+  context "scm_type != SVN", ->
+    before ->
+      @combo_box.show = sinon.spy()
+      $.withArgs("#repository_address").returns({val: -> "https://github.com/mezuro/prezento.git"})
+      $.withArgs("#repository_scm_type").returns({val: -> "GIT"})
+      sinon.stub(@subject, "fetch").withArgs("https://github.com/mezuro/prezento.git")
+
+    it "should show the branches combo box", ->
+      @subject.toggle()
+      assert.isTrue(@combo_box.show.calledOnce)
@@ -24,5 +24,7 @@ describe RepositoriesController, :type =&gt; :routing do
                   to(controller: :repositories, action: :state_with_date, project_id: 1, id: 1) }
     it { is_expected.to route(:get, '/projects/1/repositories/1/process').
                   to(controller: :repositories, action: :process_repository, project_id: 1, id: 1) }
+    it { is_expected.to route(:get, '/repository_branches').
+                  to(controller: :repositories, action: :branches) }
    end
 end
...	...	@@ -5,7 +5,7 @@ addons:
5	5	postgresql: "9.3"
6	6
7	7	before_script:
8		- - git clone https://github.com/mezuro/kalibro_install.git -b v2.3 kalibro_install
	8	+ - git clone https://github.com/mezuro/kalibro_install.git -b v2.5 kalibro_install
9	9	- pushd kalibro_install
10	10	# Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
11	11	- sudo apt-get remove libzmq3
...	...
...	...	@@ -31,7 +31,7 @@ gem 'jbuilder', '~> 2.2.2'
31	31	gem 'devise', '~> 3.4.0'
32	32
33	33	# Kalibro integration
34		-gem 'kalibro_client'
	34	+gem 'kalibro_client', '~> 0.3.0'
35	35
36	36	# PostgreSQL integration
37	37	gem "pg", "~> 0.18.1"
...	...	@@ -113,6 +113,9 @@ group :development, :test do
113	113	gem 'i18n_generators'
114	114
115	115	gem 'sprockets', '~>2.12.3' # spckets 3.0.3 breaks konacha
	116	+
	117	+ # Mocks and stubs for javascript tests
	118	+ gem 'sinon-rails'
116	119	end
117	120
118	121	# Acceptance tests
...	...
...	...	@@ -156,8 +156,8 @@ GEM
156	156	thor (>= 0.14, < 2.0)
157	157	jquery-ui-rails (5.0.3)
158	158	railties (>= 3.2.16)
159		- json (1.8.2)
160		- kalibro_client (0.1.1)
	159	+ json (1.8.3)
	160	+ kalibro_client (0.3.0)
161	161	activesupport (>= 2.2.1)
162	162	faraday_middleware (~> 0.9.0)
163	163	konacha (3.3.0)
...	...	@@ -190,7 +190,7 @@ GEM
190	190	metaclass (0.0.4)
191	191	mime-types (2.5)
192	192	mini_portile (0.6.2)
193		- minitest (5.6.1)
	193	+ minitest (5.7.0)
194	194	mocha (1.1.0)
195	195	metaclass (~> 0.0.1)
196	196	multi_json (1.11.0)
...	...	@@ -277,6 +277,8 @@ GEM
277	277	json (~> 1.8)
278	278	simplecov-html (~> 0.10.0)
279	279	simplecov-html (0.10.0)
	280	+ sinon-rails (1.15.0)
	281	+ railties (>= 3.1)
280	282	spring (1.3.6)
281	283	sprockets (2.12.3)
282	284	hike (~> 1.2)
...	...	@@ -349,7 +351,7 @@ DEPENDENCIES
349	351	jbuilder (~> 2.2.2)
350	352	jquery-rails
351	353	jquery-ui-rails (~> 5.0.0)
352		- kalibro_client
	354	+ kalibro_client (~> 0.3.0)
353	355	konacha (~> 3.3.0)
354	356	mocha
355	357	pg (~> 0.18.1)
...	...	@@ -361,6 +363,7 @@ DEPENDENCIES
361	363	sdoc (~> 0.4.0)
362	364	shoulda-matchers (~> 2.8.0)
363	365	simplecov
	366	+ sinon-rails
364	367	spring
365	368	sprockets (~> 2.12.3)
366	369	sqlite3
...	...
...	...	@@ -16,6 +16,7 @@
16	16	//= require twitter/bootstrap
17	17	//= require turbolinks
18	18	//= require modules
	19	+//= require repository
19	20	//= require Chart
20	21	//= require_tree .
21	22	//= require colorpicker
...	...
1		-class Module.Repository
2		- constructor: (@project_id, @repository_id) ->
3		-
4		- poll_state: (last_state) ->
5		- $.post '/projects/' + @project_id + '/repositories/' + @repository_id + '/state',
6		- last_state: last_state
7		-
8		- schedule_poll_state: (last_state) ->
9		- context = this
10		- call = () ->
11		- context.poll_state(last_state)
12		-
13		- setTimeout( call, 15000 ) # Delays in 15s the next call
14		-
15		- @set_loader: (loading_html) ->
16		- $('div#processing_information').html(loading_html)
	1	+@Repository = {}
...	...
...	...	@@ -0,0 +1,57 @@
	1	+class Repository.Branch
	2	+ constructor: ->
	3	+ @names = {}
	4	+ @request = null
	5	+
	6	+ toggle: ->
	7	+ if $("#repository_scm_type").val() != "SVN"
	8	+ $("#branches").show()
	9	+ @fetch($("#repository_address").val())
	10	+ else
	11	+ $("#branches").hide()
	12	+
	13	+ cancel_request: ->
	14	+ if @request != null
	15	+ @request.abort()
	16	+ @request = null
	17	+
	18	+ fill_options: (options, el) ->
	19	+ # FIXME: this works only if master is the default branch
	20	+ # it can be improved by moving it into KalibroProcessor
	21	+ default_branch = "master"
	22	+ if default_branch in options
	23	+ # Brings the default branch as the first option
	24	+ index = options.indexOf(default_branch)
	25	+ options.splice(index, 1)
	26	+ options.unshift(default_branch)
	27	+ for option in options
	28	+ do ->
	29	+ el.append($("<option></option>")
	30	+ .attr("value", option)
	31	+ .text(option))
	32	+
	33	+ fetch: (address) ->
	34	+ @cancel_request()
	35	+
	36	+ # Prevent a call with blank address
	37	+ if address == ""
	38	+ return
	39	+
	40	+ branches_select_box = $("#repository_branch")
	41	+ branches_select_box.empty() # remove old options
	42	+
	43	+ if @names[address]?
	44	+ @fill_options(@names[address], branches_select_box)
	45	+ return
	46	+
	47	+ scm_type = $("#repository_scm_type").val()
	48	+
	49	+ context = this
	50	+ @request = $.get '/repository_branches',
	51	+ {'url': address, 'scm_type': scm_type},
	52	+ (data) ->
	53	+ unless data["errors"]
	54	+ options = data["branches"]
	55	+ if options != null
	56	+ context.names[address] = options
	57	+ context.fill_options(options, branches_select_box)
...	...
...	...	@@ -0,0 +1,16 @@
	1	+class Repository.State
	2	+ constructor: (@project_id, @repository_id) ->
	3	+
	4	+ poll_state: (last_state) ->
	5	+ $.post('/projects/' + @project_id + '/repositories/' + @repository_id + '/state',
	6	+ last_state: last_state)
	7	+
	8	+ schedule_poll_state: (last_state) ->
	9	+ context = this
	10	+ call = () ->
	11	+ context.poll_state(last_state)
	12	+
	13	+ setTimeout(call, 15000) # Delays in 15s the next call
	14	+
	15	+ @set_loader: (loading_html) ->
	16	+ $('div#processing_information').html(loading_html)
0	17	\ No newline at end of file
...	...
...	...	@@ -84,6 +84,15 @@ class RepositoriesController < ApplicationController
84	84	end
85	85	end
86	86
	87	+ def branches
	88	+ branch_params = branches_params
	89	+ branches_list = Repository.branches(branch_params[:url], branch_params[:scm_type])
	90	+
	91	+ respond_to do \|format\|
	92	+ format.json { render json: branches_list }
	93	+ end
	94	+ end
	95	+
87	96	private
88	97	def set_project_id_repository_types_and_configurations
89	98	@project_id = params[:project_id]
...	...	@@ -119,6 +128,10 @@ private
119	128	params[:repository]
120	129	end
121	130
	131	+ def branches_params
	132	+ params.permit(:scm_type, :url)
	133	+ end
	134	+
122	135	# Code extracted from create action
123	136	def create_and_redir(format)
124	137	if @repository.save
...	...
...	...	@@ -43,7 +43,7 @@
43	43	<div class="form-row">
44	44	<div class="field-container">
45	45	<%= f.label :scm_type, class: 'control-label' %>
46		- <%= f.select( :scm_type, @repository_types, class: 'tooltip-control' ) %>
	46	+ <%= f.select( :scm_type, @repository_types, {}, class: 'tooltip-control', onchange: "_repository_branch.toggle();" ) %>
47	47	</div>
48	48	<div class="help-container">
49	49	<p>
...	...	@@ -55,7 +55,7 @@
55	55	<div class="form-row">
56	56	<div class="field-container">
57	57	<%= f.label :address, class: 'control-label' %>
58		- <%= f.text_field :address, :required => true, class: 'text-field form-control' %>
	58	+ <%= f.text_field :address, :required => true, class: 'text-field form-control', onchange: "_repository_branch.fetch(this.value);" %>
59	59	</div>
60	60	<div class="help-container">
61	61	<p>
...	...	@@ -64,6 +64,20 @@
64	64	</div>
65	65	</div>
66	66
	67	+ <div id="branches">
	68	+ <div class="form-row">
	69	+ <div class="field-container">
	70	+ <%= f.label :branch, class: 'control-label' %>
	71	+ <%= f.select :branch, []%>
	72	+ </div>
	73	+ <div class="help-container">
	74	+ <p>
	75	+ <%= t('activemodel.hints.repository.address') %>
	76	+ </p>
	77	+ </div>
	78	+ </div>
	79	+ </div>
	80	+
67	81	<div class="form-row">
68	82	<div class="field-container">
69	83	<%= f.label :period, class: 'control-label' %>
...	...	@@ -94,3 +108,11 @@
94	108	<%= f.submit t('save'), class: 'btn btn-primary' %>
95	109	<%= link_to t('back'), project_path(@project_id), class: 'btn btn-default' %>
96	110	</div>
	111	+
	112	+<script type="text/javascript">
	113	+ var _repository_branch = new Repository.Branch;
	114	+
	115	+ $(document).on('page:load ready', function() {
	116	+ _repository_branch.toggle();
	117	+ });
	118	+</script>
...	...
...	...	@@ -7,6 +7,6 @@ current_path = current_path_splited.join("/");
7	7	// This if prevents it from updating the repository's state after the user leaves its page
8	8	if(current_path == '<%= project_repository_path(project_id: @repository.project_id, id: @repository, locale: nil) %>'){
9	9	$('div#processing_information').html('<%= escape_javascript(render partial: "processing_information") %>');
10		- repository = new Module.Repository(<%= @repository.project_id %>, <%= @repository.id %>)
	10	+ repository = new Repository.State(<%= @repository.project_id %>, <%= @repository.id %>)
11	11	repository.schedule_poll_state('<%= @processing.state %>')
12	12	}
...	...