diff --git a/Gemfile b/Gemfile index dd21f7f..1525386 100644 --- a/Gemfile +++ b/Gemfile @@ -24,8 +24,8 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' -gem 'rearview', :path => '~/workspaces/rearview-engine' -# gem 'rearview', '1.1.2' +#gem 'rearview', :path => '~/workspaces/rearview-engine' +gem 'rearview', '~> 1.2.0' gem 'omniauth' gem 'omniauth-google-oauth2' gem 'rspec-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 248c2ff..3f894f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,3 @@ -PATH - remote: ~/workspaces/rearview-engine - specs: - rearview (1.1.2-java) - ancestry (~> 2.0.0) - broach (~> 0.3.0) - celluloid (~> 0.14.1) - devise (~> 3.2.2) - httparty (~> 0.12.0) - jbuilder (~> 1.5.2) - protected_attributes (~> 1.0.5) - rails (~> 4.0.2) - state_machine (~> 1.2.0) - statsd-ruby (~> 1.2.1) - GEM remote: http://rubygems.org/ specs: @@ -51,8 +36,11 @@ GEM ancestry (2.0.0) activerecord (>= 3.0.0) arel (4.0.1) + atomic (1.1.14) atomic (1.1.14-java) - bcrypt-ruby (3.1.2-java) + bcrypt (3.1.7-java) + bcrypt-ruby (3.1.5-java) + bcrypt (>= 3.1.3) bouncy-castle-java (1.5.0147) broach (0.3.0) multi_json (~> 1.7) @@ -68,7 +56,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) - devise (3.2.2) + devise (3.2.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -78,9 +66,12 @@ GEM dotenv (0.9.0) erubis (2.7.0) execjs (2.0.2) - faraday (0.8.8) - multipart-post (~> 1.2.0) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) ffi (1.9.3-java) + foreman (0.63.0) + dotenv (>= 0.7) + thor (>= 0.13.6) foreman (0.63.0-java) dotenv (>= 0.7) thor (>= 0.13.6) @@ -102,6 +93,7 @@ GEM thor (>= 0.14, < 2.0) jruby-openssl (0.9.4) bouncy-castle-java (>= 1.5.0147) + json (1.8.1) json (1.8.1-java) jwt (0.1.8) multi_json (>= 1.5) @@ -113,7 +105,7 @@ GEM minitest (4.7.5) multi_json (1.8.2) multi_xml (0.5.5) - multipart-post (1.2.0) + multipart-post (2.0.0) nap (0.6.0) oauth2 (0.8.1) faraday (~> 0.8) @@ -134,11 +126,17 @@ GEM polyglot (0.3.3) protected_attributes (1.0.5) activemodel (>= 4.0.1, < 5.0) + pry (0.9.12.4) + coderay (~> 1.0) + method_source (~> 0.8) + slop (~> 3.4) pry (0.9.12.4-java) coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) spoon (~> 0.0) + puma (2.7.1) + rack (>= 1.1, < 2.0) puma (2.7.1-java) rack (>= 1.1, < 2.0) rack (1.5.2) @@ -160,6 +158,19 @@ GEM rake (10.1.1) rdoc (3.12.2) json (~> 1.4) + rearview (1.2.0-java) + ancestry (~> 2.0.0) + broach (~> 0.3.0) + celluloid (~> 0.14.1) + devise (~> 3.2.2) + faraday (~> 0.9.0) + httparty (~> 0.12.0) + jbuilder (~> 1.5.2) + protected_attributes (~> 1.0.5) + rails (~> 4.0.2) + state_machine (~> 1.2.0) + statsd-ruby (~> 1.2.1) + treetop (~> 1.4.15) rspec-core (2.14.7) rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) @@ -197,6 +208,8 @@ GEM therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.4) thor (0.18.1) + thread_safe (0.1.3) + atomic thread_safe (0.1.3-java) atomic tilt (1.4.1) @@ -230,7 +243,7 @@ DEPENDENCIES pry puma rails (= 4.0.2) - rearview! + rearview (~> 1.2.0) rspec-rails sass-rails (~> 4.0.0) sdoc diff --git a/README.md b/README.md index 69ffd7e..d08dc3b 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Getting Started ### Get it -[Download](https://github.com/livingsocial/rearview/archive/v1.1.2.zip) the latest release. +[Download](https://github.com/livingsocial/rearview/archive/v1.2.0.zip) the latest release. ### Database Support diff --git a/vendor/cache/bcrypt-3.1.7-java.gem b/vendor/cache/bcrypt-3.1.7-java.gem new file mode 100644 index 0000000..d85e0aa Binary files /dev/null and b/vendor/cache/bcrypt-3.1.7-java.gem differ diff --git a/vendor/cache/bcrypt-ruby-3.1.2-java.gem b/vendor/cache/bcrypt-ruby-3.1.2-java.gem deleted file mode 100644 index aa025bb..0000000 Binary files a/vendor/cache/bcrypt-ruby-3.1.2-java.gem and /dev/null differ diff --git a/vendor/cache/bcrypt-ruby-3.1.5-java.gem b/vendor/cache/bcrypt-ruby-3.1.5-java.gem new file mode 100644 index 0000000..ee06f36 Binary files /dev/null and b/vendor/cache/bcrypt-ruby-3.1.5-java.gem differ diff --git a/vendor/cache/devise-3.2.2.gem b/vendor/cache/devise-3.2.2.gem deleted file mode 100644 index 88b26c5..0000000 Binary files a/vendor/cache/devise-3.2.2.gem and /dev/null differ diff --git a/vendor/cache/devise-3.2.3.gem b/vendor/cache/devise-3.2.3.gem new file mode 100644 index 0000000..a5706b3 Binary files /dev/null and b/vendor/cache/devise-3.2.3.gem differ diff --git a/vendor/cache/faraday-0.8.8.gem b/vendor/cache/faraday-0.8.8.gem deleted file mode 100644 index 18e2099..0000000 Binary files a/vendor/cache/faraday-0.8.8.gem and /dev/null differ diff --git a/vendor/cache/faraday-0.9.0.gem b/vendor/cache/faraday-0.9.0.gem new file mode 100644 index 0000000..0b00e52 Binary files /dev/null and b/vendor/cache/faraday-0.9.0.gem differ diff --git a/vendor/cache/multipart-post-1.2.0.gem b/vendor/cache/multipart-post-1.2.0.gem deleted file mode 100644 index fca7ae7..0000000 Binary files a/vendor/cache/multipart-post-1.2.0.gem and /dev/null differ diff --git a/vendor/cache/multipart-post-2.0.0.gem b/vendor/cache/multipart-post-2.0.0.gem new file mode 100644 index 0000000..abfff3d Binary files /dev/null and b/vendor/cache/multipart-post-2.0.0.gem differ diff --git a/vendor/cache/rearview-1.1.2-java.gem b/vendor/cache/rearview-1.1.2-java.gem deleted file mode 100644 index 9bd1694..0000000 Binary files a/vendor/cache/rearview-1.1.2-java.gem and /dev/null differ diff --git a/vendor/cache/rearview-1.2.0-java.gem b/vendor/cache/rearview-1.2.0-java.gem new file mode 100644 index 0000000..a6c6a47 Binary files /dev/null and b/vendor/cache/rearview-1.2.0-java.gem differ