Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swap app and gem #144

Merged
merged 1 commit into from
Nov 5, 2015
Merged

Swap app and gem #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
/coverage/*
/db/*.sqlite3
/log/*
/public/system
/public/assets
/spec/example_app/log/*
/spec/example_app/public/system
/spec/example_app/public/assets
/tags
/tmp/*
/spec/example_app/tmp/*
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

### Upcoming Release

* [COMPAT] Update repository structure so Bundler can pull the gem from github.
(e.g. `gem "administrate", github: "thoughtbot/administrate"`)
* [DOC] Add Rubygems version badge to README
* [DOC] Add CircleCI badge to README
* [DOC] Add CodeClimate badge to README
Expand Down
18 changes: 13 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
source "https://rubygems.org"
source 'https://rubygems.org'

ruby "2.2.0"
# Declare your gem's dependencies in administrate.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and
# development dependencies will be added by default to the :development group.
gemspec

gem 'administrate', path: "administrate"
# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org.

# To use a debugger
# gem 'byebug', group: [:development, :test]
gem "airbrake"
gem "coffee-rails", "~> 4.1.0"
gem "delayed_job_active_record"
Expand All @@ -25,8 +33,8 @@ gem "uglifier", ">= 2.7.2"
gem "unicorn"

group :development do
gem "spring"
gem "spring-commands-rspec"
# gem "spring"
# gem "spring-commands-rspec"
gem "web-console", ">= 2.1.3"
end

Expand Down
143 changes: 67 additions & 76 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PATH
remote: administrate
remote: .
specs:
administrate (0.1.0)
autoprefixer-rails (~> 6.0)
Expand Down Expand Up @@ -51,20 +51,19 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.7)
airbrake (4.1.0)
addressable (2.3.8)
airbrake (4.3.3)
builder
multi_json
ammeter (1.1.2)
ammeter (1.1.3)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-rails (>= 2.2)
appraisal (2.0.1)
activesupport (>= 3.2.21)
appraisal (2.1.0)
bundler
rake
thor (>= 0.14.0)
arel (6.0.0)
arel (6.0.3)
autoprefixer-rails (6.0.3)
execjs
json
Expand All @@ -75,128 +74,124 @@ GEM
sass (~> 3.4)
thor (~> 0.19)
builder (3.2.2)
bundler-audit (0.3.1)
bundler-audit (0.4.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
capybara (2.4.4)
byebug (6.0.2)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.4.1)
capybara (>= 2.3.0, < 2.5.0)
capybara-webkit (1.7.1)
capybara (>= 2.3.0, < 2.6.0)
json
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1)
columnize (0.9.0)
coffee-script-source (1.9.1.1)
crack (0.4.2)
safe_yaml (~> 1.0.0)
database_cleaner (1.4.0)
database_cleaner (1.5.1)
datetime_picker_rails (0.0.5)
momentjs-rails (>= 2.8.1)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
delayed_job (4.0.6)
delayed_job (4.1.1)
activesupport (>= 3.0, < 5.0)
delayed_job_active_record (4.0.3)
activerecord (>= 3.0, < 5.0)
delayed_job (>= 3.0, < 4.1)
delayed_job_active_record (4.1.0)
activerecord (>= 3.0, < 5)
delayed_job (>= 3.0, < 5)
diff-lcs (1.2.5)
dotenv (1.0.2)
dotenv-rails (1.0.2)
dotenv (= 1.0.2)
dotenv (2.0.2)
dotenv-rails (2.0.2)
dotenv (= 2.0.2)
railties (~> 4.0)
easy_translate (0.5.0)
json
thread
thread_safe
email_validator (1.5.0)
email_validator (1.6.0)
activemodel
erubis (2.7.0)
execjs (2.3.0)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faker (1.4.3)
faker (1.5.0)
i18n (~> 0.5)
flutie (2.0.0)
formulaic (0.2.0)
formulaic (0.3.0)
activesupport
capybara
i18n
fuubar (2.0.0)
rspec (~> 3.0)
ruby-progressbar (~> 1.4)
globalid (0.3.5)
globalid (0.3.6)
activesupport (>= 4.1.0)
high_voltage (2.2.1)
highline (1.7.1)
hashdiff (0.2.2)
high_voltage (2.4.0)
highline (1.7.8)
i18n (0.7.0)
i18n-tasks (0.7.12)
activesupport
i18n-tasks (0.8.7)
activesupport (>= 2.3.18)
easy_translate (>= 0.5.0)
erubis
highline
highline (>= 1.7.3)
i18n
slop (~> 3.5)
term-ansicolor
terminal-table
term-ansicolor (>= 1.3.2)
terminal-table (>= 1.5.1)
inline_svg (0.6.1)
activesupport (>= 4.0.4)
loofah (>= 2.0)
nokogiri (~> 1.6)
jquery-rails (4.0.4)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.3)
kgio (2.10.0)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.1)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.7.0)
minitest (5.8.1)
momentjs-rails (2.10.6)
railties (>= 3.1)
multi_json (1.11.1)
multi_json (1.11.2)
neat (1.7.2)
bourbon (>= 4.0)
sass (>= 3.3)
newrelic_rpm (3.10.0.279)
newrelic_rpm (3.14.0.305)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
normalize-rails (3.0.3)
pg (0.18.1)
pry (0.10.1)
pg (0.18.3)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.3)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.2.0)
rack-timeout (0.3.2)
rails (4.2.2)
actionmailer (= 4.2.2)
actionpack (= 4.2.2)
Expand All @@ -210,19 +205,19 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails_stdout_logging (0.0.3)
rails_stdout_logging (0.0.4)
railties (4.2.2)
actionpack (= 4.2.2)
activesupport (= 4.2.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
raindrops (0.15.0)
rake (10.4.2)
recipient_interceptor (0.1.2)
mail
Expand All @@ -247,40 +242,37 @@ GEM
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
ruby-progressbar (1.7.1)
ruby-progressbar (1.7.5)
safe_yaml (1.0.4)
sass (3.4.12)
sass-rails (5.0.1)
sass (3.4.19)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
tilt (>= 1.1, < 3)
selectize-rails (0.12.1)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
simple_form (3.1.0)
simple_form (3.2.0)
actionpack (~> 4.0)
activemodel (~> 4.0)
slop (3.6.0)
spring (1.3.6)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.2.0)
rack (~> 1.0)
sprockets-rails (2.3.2)
sprockets (3.4.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
term-ansicolor (1.3.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
terminal-table (1.4.5)
terminal-table (1.5.2)
thor (0.19.1)
thread (0.1.5)
thread (0.2.2)
thread_safe (0.3.5)
tilt (1.4.1)
timecop (0.7.3)
tins (1.3.4)
tilt (2.0.1)
timecop (0.8.0)
tins (1.6.0)
title (0.0.5)
i18n
rails (>= 3.1)
Expand All @@ -289,18 +281,19 @@ GEM
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
unicorn (4.9.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
web-console (2.1.3)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webmock (1.20.4)
webmock (1.22.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
xpath (2.0.0)
nokogiri (~> 1.3)

Expand Down Expand Up @@ -342,8 +335,6 @@ DEPENDENCIES
sass-rails (~> 5.0)
shoulda-matchers (~> 2.8.0)
simple_form
spring
spring-commands-rspec
timecop
title
uglifier (>= 2.7.2)
Expand Down
Loading