February 2014 - macports-changes - lists.macosforge.org

[116797] branches/gsoc11-statistics/stats-server/
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116797 https://trac.macports.org/changeset/116797 Author: cal(a)macports.org Date: 2014-02-07 11:42:18 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: ignore generated files Property Changed: ---------------- branches/gsoc11-statistics/stats-server/ Property changes on: branches/gsoc11-statistics/stats-server ___________________________________________________________________ Modified: svn:ignore - .git + .git .bundle Gemfile.lock log public tmp vendor

1 0

[116796] branches/gsoc11-statistics/stats-server/config
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116796 https://trac.macports.org/changeset/116796 Author: cal(a)macports.org Date: 2014-02-07 11:40:51 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: move database.yml to database.yml.example Added Paths: ----------- branches/gsoc11-statistics/stats-server/config/database.yml.example Removed Paths: ------------- branches/gsoc11-statistics/stats-server/config/database.yml Deleted: branches/gsoc11-statistics/stats-server/config/database.yml =================================================================== --- branches/gsoc11-statistics/stats-server/config/database.yml 2014-02-07 19:38:40 UTC (rev 116795) +++ branches/gsoc11-statistics/stats-server/config/database.yml 2014-02-07 19:40:51 UTC (rev 116796) @@ -1,22 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 Copied: branches/gsoc11-statistics/stats-server/config/database.yml.example (from rev 116795, branches/gsoc11-statistics/stats-server/config/database.yml) =================================================================== --- branches/gsoc11-statistics/stats-server/config/database.yml.example (rev 0) +++ branches/gsoc11-statistics/stats-server/config/database.yml.example 2014-02-07 19:40:51 UTC (rev 116796) @@ -0,0 +1,22 @@ +# SQLite version 3.x +# gem install sqlite3 +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000

1 0

[116795] branches/gsoc11-statistics/stats-server/config/
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116795 https://trac.macports.org/changeset/116795 Author: cal(a)macports.org Date: 2014-02-07 11:38:40 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: config: ignore my local modification to database.yml, we don't want the login data in the repo Property Changed: ---------------- branches/gsoc11-statistics/stats-server/config/ Property changes on: branches/gsoc11-statistics/stats-server/config ___________________________________________________________________ Added: svn:ignore + database.yml

1 0

[116794] branches/gsoc11-statistics/stats-server/Gemfile
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116794 https://trac.macports.org/changeset/116794 Author: cal(a)macports.org Date: 2014-02-07 11:34:59 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: switch to rails 3.2, mysql2 Modified Paths: -------------- branches/gsoc11-statistics/stats-server/Gemfile Modified: branches/gsoc11-statistics/stats-server/Gemfile =================================================================== --- branches/gsoc11-statistics/stats-server/Gemfile 2014-02-07 19:33:35 UTC (rev 116793) +++ branches/gsoc11-statistics/stats-server/Gemfile 2014-02-07 19:34:59 UTC (rev 116794) @@ -1,15 +1,15 @@ source 'http://rubygems.org' -gem 'rails', '3.0.9' +gem 'rails', '~>3.2' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem "rake", "0.8.7" +gem 'mysql2' gem 'sqlite3' gem 'json' gem 'uuid' -gem 'will_paginate', '>= 3.0.pre2' -gem 'gvis', :git => 'git://github.com/jeremyolliver/gvis.git' +gem 'will_paginate' +gem 'gvis' # Use unicorn as the web server # gem 'unicorn' @@ -30,9 +30,9 @@ # Bundle gems for the local environment. Make sure to # put test-only gems in this group so their generators # and rake tasks are available in development mode: -group :development, :test do - gem 'rspec-rails', '2.6.1' - gem 'autotest' - gem 'shoulda' - #gem 'webrat' -end +#group :development, :test do +# gem 'rspec-rails', '2.6.1' +# gem 'autotest' +# gem 'shoulda' +# #gem 'webrat' +#end

1 0

[116793] branches/gsoc11-statistics/stats-server/db/
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116793 https://trac.macports.org/changeset/116793 Author: cal(a)macports.org Date: 2014-02-07 11:33:35 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: ignore generated file Property Changed: ---------------- branches/gsoc11-statistics/stats-server/db/ Property changes on: branches/gsoc11-statistics/stats-server/db ___________________________________________________________________ Added: svn:ignore + seeds.rb

1 0

[116792] branches/gsoc11-statistics/stats-server/db/schema.rb
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116792 https://trac.macports.org/changeset/116792 Author: cal(a)macports.org Date: 2014-02-07 11:32:44 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: committing changes to schema.rb that have been sitting in my installation for ages now; I don't remember how they got there. Modified Paths: -------------- branches/gsoc11-statistics/stats-server/db/schema.rb Modified: branches/gsoc11-statistics/stats-server/db/schema.rb =================================================================== --- branches/gsoc11-statistics/stats-server/db/schema.rb 2014-02-07 19:31:44 UTC (rev 116791) +++ branches/gsoc11-statistics/stats-server/db/schema.rb 2014-02-07 19:32:44 UTC (rev 116792) @@ -1,3 +1,4 @@ +# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -14,16 +15,16 @@ create_table "categories", :force => true do |t| t.string "name" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "installed_ports", :force => true do |t| t.integer "port_id" t.string "version" t.text "variants" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "user_id" end @@ -31,8 +32,8 @@ add_index "installed_ports", ["user_id"], :name => "index_installed_ports_on_user_id" create_table "os_statistics", :force => true do |t| - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "macports_version" t.string "osx_version" t.string "os_arch" @@ -56,22 +57,22 @@ t.string "maintainers" t.string "platforms" t.string "categories" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "ports", ["name"], :name => "index_ports_on_name" create_table "submissions", :force => true do |t| t.string "data" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "users", :force => true do |t| t.string "uuid" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end end

1 0

[116791] branches/gsoc11-statistics/stats-server/app/views/partials/ _chart_draw.html.erb
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116791 https://trac.macports.org/changeset/116791 Author: cal(a)macports.org Date: 2014-02-07 11:31:44 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: fix error with rails 3.2 Modified Paths: -------------- branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb Modified: branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb =================================================================== --- branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb 2014-02-07 19:30:37 UTC (rev 116790) +++ branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb 2014-02-07 19:31:44 UTC (rev 116791) @@ -55,15 +55,15 @@ <% if not controller.dataset_empty? chart %> <%# Draw visualization %> - <% visualization chart, type, vis_options do |visualization| %> - <% controller.populate_chart chart, visualization %> + <% visualization chart.to_s, type, vis_options do |viz| %> + <% controller.populate_chart chart, viz %> <% end %> <% if drawtables %> <%# Draw table %> <% table = chart.to_s + "_table" %> - <% visualization table, "Table", table_options do |visualization| %> - <% controller.populate_chart chart, visualization %> + <% visualization table, "Table", table_options do |viz| %> + <% controller.populate_chart chart, viz %> <% end %> <% end %>

1 0

[116790] branches/gsoc11-statistics/stats-server/app/controllers/ installed_ports_controller.rb
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116790 https://trac.macports.org/changeset/116790 Author: cal(a)macports.org Date: 2014-02-07 11:30:37 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stat: fix errors when no ports/stats available Modified Paths: -------------- branches/gsoc11-statistics/stats-server/app/controllers/installed_ports_controller.rb Modified: branches/gsoc11-statistics/stats-server/app/controllers/installed_ports_controller.rb =================================================================== --- branches/gsoc11-statistics/stats-server/app/controllers/installed_ports_controller.rb 2014-02-07 19:29:46 UTC (rev 116789) +++ branches/gsoc11-statistics/stats-server/app/controllers/installed_ports_controller.rb 2014-02-07 19:30:37 UTC (rev 116790) @@ -21,7 +21,8 @@ sum = sum + user.installed_ports.count end - average = sum / users.count + return 0 unless users.count > 0 + average = sum / users.count unless users.count == 0 end # Find the port that has been installed most this year @@ -39,8 +40,12 @@ # most populator port this year popular_port_year = top.first - @popular_port_year = Port.find(popular_port_year[0]) - @popular_port_year_count = popular_port_year[1] + @popular_port_year = nil + @popular_port_year_count = 0 + unless popular_port_year == nil + @popular_port_year = Port.find(popular_port_year[0]) + @popular_port_year_count = popular_port_year[1] + end end # Most popular port this month @@ -110,4 +115,4 @@ end end -end \ No newline at end of file +end

1 0

[116789] branches/gsoc11-statistics/stats-server/Gemfile.lock
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116789 https://trac.macports.org/changeset/116789 Author: cal(a)macports.org Date: 2014-02-07 11:29:46 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: delete generated file Gemfile.lock Removed Paths: ------------- branches/gsoc11-statistics/stats-server/Gemfile.lock Deleted: branches/gsoc11-statistics/stats-server/Gemfile.lock =================================================================== --- branches/gsoc11-statistics/stats-server/Gemfile.lock 2014-02-07 18:29:33 UTC (rev 116788) +++ branches/gsoc11-statistics/stats-server/Gemfile.lock 2014-02-07 19:29:46 UTC (rev 116789) @@ -1,116 +0,0 @@ -GIT - remote: git://github.com/jeremyolliver/gvis.git - revision: 018819a0e0a974eafc38f2c87d214d37f4fb27ab - specs: - gvis (2.0.3) - json - -GEM - remote: http://rubygems.org/ - specs: - ZenTest (4.6.2) - abstract (1.0.0) - actionmailer (3.0.9) - actionpack (= 3.0.9) - mail (~> 2.2.19) - actionpack (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.1) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.9) - activesupport (= 3.0.9) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - arel (~> 2.0.10) - tzinfo (~> 0.3.23) - activeresource (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - activesupport (3.0.9) - arel (2.0.10) - autotest (4.4.6) - ZenTest (>= 4.4.1) - builder (2.1.2) - diff-lcs (1.1.3) - erubis (2.6.6) - abstract (>= 1.0.0) - i18n (0.5.0) - json (1.5.3) - macaddr (1.4.0) - systemu (~> 2.2.0) - mail (2.2.19) - activesupport (>= 2.3.6) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.16) - polyglot (0.3.2) - rack (1.2.3) - rack-mount (0.6.14) - rack (>= 1.0.0) - rack-test (0.5.7) - rack (>= 1.0) - rails (3.0.9) - actionmailer (= 3.0.9) - actionpack (= 3.0.9) - activerecord (= 3.0.9) - activeresource (= 3.0.9) - activesupport (= 3.0.9) - bundler (~> 1.0) - railties (= 3.0.9) - railties (3.0.9) - actionpack (= 3.0.9) - activesupport (= 3.0.9) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.4) - rake (0.8.7) - rdoc (3.9.2) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rspec-rails (2.6.1) - actionpack (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) - rspec (~> 2.6.0) - shoulda (2.11.3) - sqlite3 (1.3.4) - systemu (2.2.0) - thor (0.14.6) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.29) - uuid (2.3.4) - macaddr (~> 1.0) - will_paginate (3.0.0) - -PLATFORMS - ruby - -DEPENDENCIES - autotest - gvis! - json - rails (= 3.0.9) - rake (= 0.8.7) - rspec-rails (= 2.6.1) - shoulda - sqlite3 - uuid - will_paginate (>= 3.0.pre2)

1 0

[116788] trunk/dports/databases/sqlite3/Portfile
by jberry＠macports.org 07 Feb '14

07 Feb '14

Revision: 116788 https://trac.macports.org/changeset/116788 Author: jberry(a)macports.org Date: 2014-02-07 10:29:33 -0800 (Fri, 07 Feb 2014) Log Message: ----------- sqlite3: enable FTS4, STAT4, SoundEx, and parenthesis in FTS searches Modified Paths: -------------- trunk/dports/databases/sqlite3/Portfile Modified: trunk/dports/databases/sqlite3/Portfile =================================================================== --- trunk/dports/databases/sqlite3/Portfile 2014-02-07 17:09:56 UTC (rev 116787) +++ trunk/dports/databases/sqlite3/Portfile 2014-02-07 18:29:33 UTC (rev 116788) @@ -5,6 +5,7 @@ name sqlite3 version 3.8.3 +revision 1 categories databases platforms darwin license public-domain @@ -38,7 +39,7 @@ --enable-readline # search in worksrcpath for sqlite3.h first -- dont pick up an installed one! -configure.cppflags "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -I${worksrcpath} -I${prefix}/include" +configure.cppflags "-DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SOUNDEX -I${worksrcpath} -I${prefix}/include" build.type gnu

1 0