diff --git a/Gemfile b/Gemfile index 566bdcf..2d3f82e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,12 @@ source 'http://rubygems.org' # Rails & server stuff -gem 'rails', '3.1.0' +gem 'rails', '3.2.0' gem 'unicorn' gem 'delayed_job' -# Rails 3.1 support gems +gem 'pg' + gem 'therubyracer', :require => false # Data parse utils @@ -17,26 +18,21 @@ gem 'haml' gem 'sass' gem 'coffee-script' gem 'jquery-rails' -gem 'bootstrap-sass', '1.4.0' +gem 'sass-rails' +gem 'bootstrap-sass', '1.4.4' gem 'chosen-rails' -gem 'i18n-js' # Music related stuff gem 'lastfm-client', :git => 'http://github.com/pch/lastfm-client.git' -# gem 'musicbrainz', :require => 'musicbrainz' -gem 'musicbrainz', path: "vendor/plugins/gems/musicbrainz", :require => 'musicbrainz' +gem 'musicbrainz', :require => 'musicbrainz' +gem 'discogs-wrapper' +# gem 'musicbrainz', path: "vendor/plugins/gems/musicbrainz", :require => 'musicbrainz' # Misc utils gem 'bitmask_attributes' gem 'awesome_print', :require => 'ap' -gem 'heroku' - -group :development do - gem 'mysql2', '0.3.7' -end group :production do - gem 'pg' gem 'dalli' # Memcache gem 'uglifier' -end \ No newline at end of file +end diff --git a/Gemfile.lock b/Gemfile.lock index 2a0a804..e9aaaa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,153 +5,128 @@ GIT lastfm-client (0.0.3) json (>= 1.4.6) -PATH - remote: vendor/plugins/gems/musicbrainz - specs: - musicbrainz (0.5.4) - nokogiri - GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0) - actionpack (= 3.1.0) - mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + actionmailer (3.2.0) + actionpack (= 3.2.0) + mail (~> 2.4.0) + actionpack (3.2.0) + activemodel (= 3.2.0) + activesupport (= 3.2.0) builder (~> 3.0.0) erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) - rack-mount (~> 0.8.2) + journey (~> 1.0.0) + rack (~> 1.4.0) + rack-cache (~> 1.1) rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) + sprockets (~> 2.1.2) + activemodel (3.2.0) + activesupport (= 3.2.0) builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - arel (~> 2.2.1) + activerecord (3.2.0) + activemodel (= 3.2.0) + activesupport (= 3.2.0) + arel (~> 3.0.0) tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) + activeresource (3.2.0) + activemodel (= 3.2.0) + activesupport (= 3.2.0) + activesupport (3.2.0) + i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.2.6) - arel (2.2.1) - awesome_print (1.0.1) - bcrypt-ruby (3.0.1) - bitmask_attributes (0.2.4) + arel (3.0.2) + awesome_print (1.0.2) + bitmask_attributes (0.3.0) activerecord (~> 3.0) - bootstrap-sass (1.4.0) - sass-rails (~> 3.1.0) + bootstrap-sass (1.4.4) + sass-rails (~> 3.1) builder (3.0.0) - chosen-rails (0.9.5) + chosen-rails (0.9.8.1) railties (~> 3.0) thor (~> 0.14) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.3) - daemons (1.1.4) - dalli (1.1.3) - delayed_job (2.1.4) + coffee-script-source (1.3.3) + dalli (2.1.0) + delayed_job (3.0.3) activesupport (~> 3.0) - daemons + discogs-wrapper (1.1.3) erubis (2.7.0) - execjs (1.2.9) + execjs (1.4.0) multi_json (~> 1.0) - haml (3.1.4) - heroku (2.14.0) - launchy (>= 0.3.2) - rest-client (~> 1.6.1) - rubyzip - term-ansicolor (~> 1.0.5) + haml (3.1.6) hike (1.2.1) i18n (0.6.0) - i18n-js (2.1.2) - i18n - jquery-rails (1.0.19) - railties (~> 3.0) + journey (1.0.4) + jquery-rails (2.0.2) + railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.6.2) - kgio (2.6.0) - launchy (2.0.5) - addressable (~> 2.2.6) + json (1.7.3) + kgio (2.7.4) libv8 (3.3.10.4) - mail (2.3.0) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.17.2) - multi_json (1.0.4) - mysql2 (0.3.7) - nokogiri (1.5.0) - pg (0.11.0) + mime-types (1.19) + multi_json (1.3.6) + musicbrainz (0.7.0) + nokogiri + nokogiri (1.5.5) + pg (0.14.0) polyglot (0.3.3) - rack (1.3.5) - rack-cache (1.0.3) + rack (1.4.1) + rack-cache (1.2) rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-ssl (1.3.2) rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) + rails (3.2.0) + actionmailer (= 3.2.0) + actionpack (= 3.2.0) + activerecord (= 3.2.0) + activeresource (= 3.2.0) + activesupport (= 3.2.0) bundler (~> 1.0) - railties (= 3.1.0) - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) + railties (= 3.2.0) + railties (3.2.0) + actionpack (= 3.2.0) + activesupport (= 3.2.0) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - raindrops (0.8.0) + raindrops (0.10.0) rake (0.9.2.2) - rdoc (3.11) + rdoc (3.12) json (~> 1.4) - rest-client (1.6.7) - mime-types (>= 1.16) - rubyzip (0.9.5) - sass (3.1.11) - sass-rails (3.1.5) - actionpack (~> 3.1.0) - railties (~> 3.1.0) - sass (~> 3.1.10) - tilt (~> 1.3.2) - sprockets (2.0.3) + sass (3.1.20) + sass-rails (3.2.5) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - term-ansicolor (1.0.7) - therubyracer (0.9.9) + therubyracer (0.10.1) libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) - uglifier (1.1.0) + tzinfo (0.3.33) + uglifier (1.2.6) execjs (>= 0.3.0) - multi_json (>= 1.0.2) - unicorn (4.1.1) - kgio (~> 2.4) + multi_json (~> 1.3) + unicorn (4.3.1) + kgio (~> 2.6) rack - raindrops (~> 0.6) + raindrops (~> 0.7) PLATFORMS ruby @@ -159,23 +134,22 @@ PLATFORMS DEPENDENCIES awesome_print bitmask_attributes - bootstrap-sass (= 1.4.0) + bootstrap-sass (= 1.4.4) chosen-rails coffee-script dalli delayed_job + discogs-wrapper haml - heroku - i18n-js jquery-rails json lastfm-client! - musicbrainz! - mysql2 (= 0.3.7) + musicbrainz nokogiri pg - rails (= 3.1.0) + rails (= 3.2.0) sass + sass-rails therubyracer uglifier unicorn diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 5037fcb..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,86 +0,0 @@ -Vagrant::Config.run do |config| - # All Vagrant configuration is done here. The most common configuration - # options are documented and commented below. For a complete reference, - # please see the online documentation at vagrantup.com. - - # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "base" - - # The url from where the 'config.vm.box' box will be fetched if it - # doesn't already exist on the user's system. - # config.vm.box_url = "http://domain.com/path/to/above.box" - - # Boot with a GUI so you can see the screen. (Default is headless) - # config.vm.boot_mode = :gui - - # Assign this VM to a host only network IP, allowing you to access it - # via the IP. - # config.vm.network "33.33.33.10" - - # Forward a port from the guest to the host, which allows for outside - # computers to access the VM, whereas host only networking does not. - # config.vm.forward_port "http", 80, 8080 - - # Share an additional folder to the guest VM. The first argument is - # an identifier, the second is the path on the guest to mount the - # folder, and the third is the path on the host to the actual folder. - # config.vm.share_folder "v-data", "/vagrant_data", "../data" - - # Enable provisioning with Puppet stand alone. Puppet manifests - # are contained in a directory path relative to this Vagrantfile. - # You will need to create the manifests directory and a manifest in - # the file base.pp in the manifests_path directory. - # - # An example Puppet manifest to provision the message of the day: - # - # # group { "puppet": - # # ensure => "present", - # # } - # # - # # File { owner => 0, group => 0, mode => 0644 } - # # - # # file { '/etc/motd': - # # content => "Welcome to your Vagrant-built virtual machine! - # # Managed by Puppet.\n" - # # } - # - # config.vm.provision :puppet do |puppet| - # puppet.manifests_path = "manifests" - # puppet.manifest_file = "base.pp" - # end - - # Enable provisioning with chef solo, specifying a cookbooks path (relative - # to this Vagrantfile), and adding some recipes and/or roles. - # - # config.vm.provision :chef_solo do |chef| - # chef.cookbooks_path = "cookbooks" - # chef.add_recipe "mysql" - # chef.add_role "web" - # - # # You may also specify custom JSON attributes: - # chef.json = { :mysql_password => "foo" } - # end - - # Enable provisioning with chef server, specifying the chef server URL, - # and the path to the validation key (relative to this Vagrantfile). - # - # The Opscode Platform uses HTTPS. Substitute your organization for - # ORGNAME in the URL and validation key. - # - # If you have your own Chef Server, use the appropriate URL, which may be - # HTTP instead of HTTPS depending on your configuration. Also change the - # validation key to validation.pem. - # - # config.vm.provision :chef_client do |chef| - # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" - # chef.validation_key_path = "ORGNAME-validator.pem" - # end - # - # If you're using the Opscode platform, your validator client is - # ORGNAME-validator, replacing ORGNAME with your organization name. - # - # IF you have your own Chef Server, the default validation client name is - # chef-validator, unless you changed the configuration. - # - # chef.validation_client_name = "ORGNAME-validator" -end diff --git a/config/database.yml b/config/database.yml index 4a7c0b1..7b3d528 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,15 +1,15 @@ -development: - adapter: mysql2 - database: beathaven - username: root - password: test +development: &defaults + adapter: postgresql + database: beathaven_development + username: beathaven + password: beathaven host: localhost + pool: 5 test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 + <<: *defaults + database: beathaven_test production: - adapter: postgresql \ No newline at end of file + <<: *defaults + database: beathaven_production