Merge pull request #110 from lodge/release-0.10.0

Release 0.10.0

.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

.env.example

@@ -0,0 +1,42 @@
+### アプリケーションのドメイン
+LODGE_DOMAIN      = example.com
+
+### キーの設定
+
+# Cookie 検証用キーの設定
+# productionモードで動かす場合に設定（`rake secret` で生成する）
+SECRET_KEY_BASE   = __some_random_string__
+
+# 認証キーの設定
+# productionモードで動かす場合に設定（`rake secret` で生成する）
+DEVISE_SECRET_KEY = __some_random_string__
+
+# Google OAuth2キーの設定
+GOOGLE_CLIENT_ID     =
+GOOGLE_CLIENT_SECRET =
+
+### メールの設定
+
+# 外部 MTA (SMTPサーバ) を利用してメール送信する場合
+DELIVERY_METHOD   = smtp
+
+# デバッグ用: SMTP を使用せずにメールの確認する場合
+# DELIVERY_METHOD   = letter_opener
+
+# ローカルの MTA (Postfixなど) を利用する場合
+# DELIVERY_METHOD   = sendmail
+
+# メールの送信元として扱われるアドレス
+MAIL_SENDER       = lodge@example.com
+
+# DELIVERY_METHOD = smtp の場合のみ
+# 以下の設定が有効です（それ以外は無視されます）
+SMTP_ADDRESS      = smtp.gmail.com
+SMTP_PORT         = 587
+SMTP_USERNAME     = username
+SMTP_PASSWORD     = password
+SMTP_AUTH_METHOD  = plain
+SMTP_ENABLE_STARTTLS_AUTO = true
+
+# テーマを設定します。
+LODGE_THEME       = lodge

.gitignore

@@ -7,26 +7,37 @@
 # Ignore bundler config.
 /.bundle
 
+# Ignore vagrant directory.
+/.vagrant
+
+# Ignore cookbooks directory.
+/cookbooks
+
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
 /db/data.yml
+/db/schema.rb
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
 
-/config/environments/development.rb
-/config/environments/production.rb
-/config/environments/test.rb
 /config/database.yml
 
 /Gemfile.lock
-/vendor/bundler
+/vendor/bundle
 lodge_development
 lodge_test
 lodge_production
 
 config/settings.local.yml
 config/settings/*.local.yml
 config/environments/*.local.yml
+
+public/uploads/
+
+.env
+
+# Mac finder artifacts
+.DS_Store

.rspec

@@ -0,0 +1,3 @@
+--color
+#--warnings
+--require spec_helper

.travis.yml

@@ -0,0 +1,24 @@
+language: ruby
+rvm:
+    - 1.9.3
+    - 2.0.0
+    - 2.1.2
+env:
+    - DB=sqlite
+    - DB=mysql
+    - DB=postgresql
+before_script:
+    - cp config/database.test.yml config/database.yml
+    - cp .env.example .env
+    - bundle install
+script:
+    - RAILS_ENV=test bin/rake db:create --trace
+    - RAILS_ENV=test bin/rake db:migrate --trace
+    - RAILS_ENV=test bin/rake spec --trace
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/7e569f9f53d7c2c902a9 
+  on_success: always  # options: [always|never|change] default: always
+  on_failure: always  # options: [always|never|change] default: always
+  on_start: false     # default: false

Cheffile

@@ -0,0 +1,11 @@
+site "http://community.opscode.com/api/v1"
+
+cookbook 'apt'
+cookbook 'build-essential'
+cookbook 'postfix'
+cookbook 'mysql'
+cookbook 'ruby_build'
+cookbook 'nodejs', git: 'https://github.com/mdxp/nodejs-cookbook'
+cookbook 'rbenv', git: 'https://github.com/fnichol/chef-rbenv'
+cookbook 'vim'
+cookbook 'timezone-ii'

Cheffile.lock

@@ -0,0 +1,45 @@
+SITE
+  remote: http://community.opscode.com/api/v1
+  specs:
+    apt (2.4.0)
+    build-essential (2.0.4)
+    mysql (5.3.6)
+      yum-mysql-community (>= 0.0.0)
+    postfix (3.3.1)
+    ruby_build (0.8.0)
+    timezone-ii (0.2.0)
+    vim (1.1.2)
+    yum (3.2.2)
+    yum-epel (0.3.6)
+      yum (~> 3.0)
+    yum-mysql-community (0.1.8)
+      yum (>= 3.0.0)
+
+GIT
+  remote: https://github.com/fnichol/chef-rbenv
+  ref: master
+  sha: 0a3018634bafe58ad21c6ee271af015220e444b9
+  specs:
+    rbenv (0.7.3)
+
+GIT
+  remote: https://github.com/mdxp/nodejs-cookbook
+  ref: master
+  sha: e2415cd8c4e03dccf21d7ef6ca31e1c5c81467ca
+  specs:
+    nodejs (1.3.0)
+      apt (>= 0.0.0)
+      build-essential (>= 0.0.0)
+      yum-epel (>= 0.0.0)
+
+DEPENDENCIES
+  apt (>= 0)
+  build-essential (>= 0)
+  mysql (>= 0)
+  nodejs (>= 0)
+  postfix (>= 0)
+  rbenv (>= 0)
+  ruby_build (>= 0)
+  timezone-ii (>= 0)
+  vim (>= 0)
+

Gemfile

@@ -1,25 +1,28 @@
 source 'https://rubygems.org'
 
 
+gem 'nokogiri', '~> 1.6'
+
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.0'
+gem 'rails', '~> 4.1'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
+gem 'sass-rails', '~> 4.0'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '~> 2.5'
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer',  platforms: :ruby
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 3.1'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+gem 'turbolinks', '~> 2.2'
+gem 'jquery-turbolinks', '~> 2.0'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
+gem 'jbuilder', '~> 2.1'
 # bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0',          group: :doc
+gem 'sdoc',          group: :doc
 
 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 gem 'spring',        group: :development
@@ -28,34 +31,69 @@ gem 'spring',        group: :development
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use unicorn as the app server
-# gem 'unicorn'
+gem 'unicorn', '~> 4.8'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 
-gem 'devise'
-gem 'awesome_print'
-gem 'foreigner'
-gem 'railroady'
-gem 'acts-as-taggable-on'
-gem 'coderay'
-gem 'redcarpet'
-gem 'thin'
-gem 'kaminari'
-gem 'coderay_bash'
-gem 'diffy'
+gem 'devise', '~> 3.2'
+gem 'awesome_print', '~> 1.2'
+gem 'foreigner', '~> 1.6'
+gem 'railroady', '~> 1.1'
+gem 'acts-as-taggable-on', '~> 3.3'
+gem 'redcarpet', '~> 3.1'
+gem 'thin', '~> 1.6'
+gem 'kaminari', '~> 0.16'
+gem 'coderay', '~> 1.1'
+gem 'coderay_bash', '~> 1.0'
+gem 'diffy', '~> 3.0'
 gem 'yaml_db', git: 'https://github.com/jetthoughts/yaml_db', ref: 'fb4b6bd7e12de3cffa93e0a298a1e5253d7e92ba'
-gem 'activerecord-import'
-gem 'counter_culture', '~> 0.1.18'
-gem 'rails_config'
+gem 'activerecord-import', '~> 0.5'
+gem 'counter_culture', '~> 0.1'
+gem 'rails_config', '~> 0.4'
+gem 'dotenv-rails', '~> 0.11'
+gem 'bootstrap-sass', '~> 3.2'
+gem 'bootswatch-rails', '~> 3.2'
+gem 'autoprefixer-rails', '~> 2.2'
+gem 'compass-rails', '~> 2.0'
 #gem 'whenever', :require => false
+gem 'omniauth-google-oauth2', '~> 0.2'
+gem 'carrierwave', '~> 0.10'
+gem 'jquery-fileupload-rails', '~> 0.4'
 
+ruby_versions = RUBY_VERSION.split('.')
 group :development do
   gem 'bullet'
   gem 'rack-mini-profiler'
+  gem 'letter_opener'
+  gem 'binding_of_caller'
+  if ruby_versions[0].to_i >= 2 then
+    gem 'better_errors'
+  end
+end
+
+group :development, :test do
+  gem 'rspec-rails'
+  gem 'rspec-its'
+  gem 'factory_girl_rails'
+  gem 'pry'
+  gem 'pry-rails'
+  if ruby_versions[0].to_i >= 2 then
+    gem 'pry-byebug'
+  end
+  gem 'pry-rescue'
+  gem 'coveralls', require: false
+end
+
+group :test do
+  gem 'shoulda-matchers'
+  gem 'capybara'
+  gem 'poltergeist'
+  gem 'database_cleaner'
+  gem 'launchy'
 end
 
 # Include database gems for the adapters found in the database
@@ -65,19 +103,19 @@ require 'yaml'
 database_file = File.join(File.dirname(__FILE__), "config/database.yml")
 if File.exist?(database_file)
   database_config = YAML::load(ERB.new(IO.read(database_file)).result)
-  adapter = database_config["default"]["adapter"]
-  unless adapter.nil?
-    case adapter
-    when 'mysql2'
-      gem "mysql2"
-    when 'mysql'
-      gem "mysql"
-    when /postgresql/
-      gem "pg"
-    when /sqlite3/
-      gem "sqlite3"
-    else
-      warn("Unknown database adapter `#{adapter}` found in config/database.yml")
+  adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
+  if adapters.any?
+    adapters.each do |adapter|
+      case adapter
+      when 'mysql2'
+        gem "mysql2", '~> 0.3'
+      when /postgresql/
+        gem "pg", '~> 0.17'
+      when /sqlite3/
+        gem "sqlite3", '~> 1.3'
+      else
+        warn("Unknown database adapter `#{adapter}` found in config/database.yml")
+      end
     end
   else
     warn("No adapter found in config/database.yml, please configure it first")

Guardfile

@@ -7,5 +7,5 @@ guard 'livereload' do
   watch(%r{public/.+\.(css|js|html)})
   watch(%r{config/locales/.+\.yml})
   # Rails Assets Pipeline
-  watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
+  watch(%r{(app|vendor|lib)(/assets/\w+/(.+\.(s?css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
 end