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

Jump to bottom

updated README release section and updated gem dependencies #1975

Closed
wants to merge 10 commits into from
Closed

updated README release section and updated gem dependencies #1975

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
998ebdd
updated README release section and updated gem dependencies
briri Oct 31, 2018
35a85fe
removed redundent puma gem. Added database.yml back to bin/setup
briri Oct 31, 2018
91832be
renamed database example yaml
briri Oct 31, 2018
c9d3a00
renamed database example yaml
briri Oct 31, 2018
663e251
updated deprecated line in orgs factory. added branding sample
briri Nov 1, 2018
bbcfc82
added eslint init to bin/setup
briri Nov 1, 2018
bcc7fdf
added eslint configs
briri Nov 1, 2018
5894dfe
removed eslint from bin/setup
briri Nov 1, 2018
65c125e
added in secrets sample yaml to bin/setup
briri Nov 5, 2018
d0aa1c2
moved app/javascript to app/assets/javascripts
briri Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Expand Up @@ -99,8 +99,8 @@ node_modules

spec/examples.txt
.babelrc
.eslintignore
.eslintrc.json
#.eslintignore
#.eslintrc.json
.postcssrc.yml
/public/packs
/public/packs-test
Expand Down
3 changes: 0 additions & 3 deletions Gemfile
View file
Open in desktop
Expand Up @@ -132,9 +132,6 @@ gem 'mini_racer'
# Provides binaries for WKHTMLTOPDF project in an easily accessible package.
gem 'wkhtmltopdf-binary'

# Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications (http://puma.io)
gem 'puma'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, not sure how this got in there twice


# PDF generator (from HTML) gem for Ruby on Rails (https://github.com/mileszs/wicked_pdf)
gem 'wicked_pdf'

Expand Down
61 changes: 32 additions & 29 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ GEM
io-like (~> 0.3.0)
arel (6.0.4)
ast (2.4.0)
autoprefixer-rails (9.1.4)
autoprefixer-rails (9.3.1)
execjs
bcrypt (3.1.12)
better_errors (2.5.0)
Expand All @@ -66,23 +66,24 @@ GEM
sass (>= 3.3.4)
brakeman (4.3.1)
builder (3.2.3)
bullet (5.7.6)
bullet (5.8.1)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
uniform_notifier (~> 1.11)
bundle-audit (0.1.0)
bundler-audit
bundler-audit (0.6.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (10.0.2)
capybara (3.9.0)
capybara (3.10.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
capybara-screenshot (1.0.21)
regexp_parser (~> 1.2)
xpath (~> 3.2)
capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4)
launchy
childprocess (0.9.0)
Expand All @@ -91,7 +92,7 @@ GEM
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.0)
contact_us (1.2.0)
rails (>= 4.2.0)
crack (0.4.3)
Expand All @@ -106,7 +107,7 @@ GEM
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
devise_invitable (1.7.4)
devise_invitable (1.7.5)
actionmailer (>= 4.1.0)
devise (>= 4.0.0)
diff-lcs (1.3)
Expand All @@ -130,7 +131,7 @@ GEM
railties (>= 3.0.0)
faker (1.9.1)
i18n (>= 0.7)
faraday (0.12.2)
faraday (0.15.3)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
Expand Down Expand Up @@ -189,7 +190,7 @@ GEM
activesupport (>= 3.0.0)
multi_json (>= 1.2)
json (2.1.0)
jwt (1.5.6)
jwt (2.1.0)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand All @@ -212,11 +213,11 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
locale (2.1.2)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
metaclass (0.0.4)
method_source (0.9.0)
Expand All @@ -237,9 +238,9 @@ GEM
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
Expand All @@ -257,7 +258,7 @@ GEM
options (2.3.2)
orm_adapter (0.5.0)
parallel (1.12.1)
parser (2.5.1.2)
parser (2.5.3.0)
ast (~> 2.4.0)
pg (0.19.0)
po_to_json (1.0.1)
Expand Down Expand Up @@ -316,9 +317,12 @@ GEM
ffi (>= 0.5.0, < 2)
recaptcha (4.12.0)
json
regexp_parser (1.2.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rollbar (2.18.0)
multi_json
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
Expand All @@ -327,13 +331,13 @@ GEM
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.1)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.0)
rspec-rails (3.8.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
Expand All @@ -342,19 +346,19 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.59.2)
rubocop (0.60.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
unicode-display_width (~> 1.4.0)
rubocop-dmp_roadmap (1.1.0)
rubocop (>= 0.58.2)
rubocop-rails_config (>= 0.2.2)
rubocop-rspec (>= 1.27.0)
rubocop-rails_config (0.2.5)
rubocop-rails_config (0.2.6)
railties (>= 3.0)
rubocop (~> 0.56)
rubocop-rspec (1.30.0)
Expand All @@ -375,14 +379,13 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (1.12.1)
sassc (2.0.0)
ffi (~> 1.9.6)
sass (>= 3.3.0)
sassc-rails (1.3.0)
rake
sassc-rails (2.0.0)
railties (>= 4.0.0)
sass
sassc (~> 1.9)
sprockets (> 2.11)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sax-machine (1.3.2)
Expand Down Expand Up @@ -424,7 +427,7 @@ GEM
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.4.0)
uniform_notifier (1.11.0)
uniform_notifier (1.12.1)
warden (1.2.7)
rack (>= 1.0)
web-console (3.3.0)
Expand All @@ -441,7 +444,7 @@ GEM
railties (>= 4.2)
wicked_pdf (1.1.0)
wkhtmltopdf-binary (0.12.4)
xpath (3.1.0)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.16)
yard-tomdoc (0.7.1)
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Expand Up @@ -9,8 +9,7 @@ The tool has four main functions:
3. To export attractive and useful plans in a variety of formats;
4. To allow collaborative work when creating Data Management Plans.

#### Current Release
[v1.1.3](https://github.com/DMPRoadmap/roadmap/releases/tag/v1.1.3)
Download the latest release [here](https://github.com/DMPRoadmap/roadmap/releases)
[![Build Status](https://travis-ci.org/DMPRoadmap/roadmap.svg)](https://travis-ci.org/DMPRoadmap/roadmap)

#### Pre-requisites
Expand Down
1 change: 1 addition & 0 deletions app/assets/.eslintignore
View file
Open in desktop
@@ -0,0 +1 @@
javascripts/locale
12 changes: 12 additions & 0 deletions app/assets/.eslintrc.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"extends": "airbnb-base",
"env": {
"jasmine": true,
"jquery": true
},
"globals": {
"timeago": true,
"fixture": true,
"spyOnEvent": true
}
}
9 changes: 5 additions & 4 deletions bin/setup
View file
Open in desktop
Expand Up @@ -12,10 +12,11 @@ Dir.chdir APP_ROOT do
system "gem install bundler --conservative"
system "bundle check || bundle install"

# puts "\n== Copying sample files =="
# unless File.exist?("config/database.yml")
# system "cp config/database.yml.sample config/database.yml"
# end
puts "\n== Copying sample files =="
unless File.exist?("config/database.yml")
system "cp config/database.yml.sample config/database.yml"
system "cp config/branding.yml.sample config/branding.yml"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should update this since we've changed the way we name these files

Suggested change
system "cp config/branding.yml.sample config/branding.yml"
system "cp config/database_example.yml config/database.yml"
system "cp config/branding_example.yml config/branding.yml"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps a line to copy over the config/secrets_example.yml as well, that seems to be what travis is complaining about

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Not sure what happened to them. They must have been in here somewhere for it to have been working at all before

end

puts "\n== Preparing database =="
system "bin/rake db:setup"
Expand Down
0 config/branding_example.yml → config/branding.yml.sample
View file
Open in desktop
File renamed without changes.
0 config/database_example.yml → config/database.yml.sample
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion spec/factories/orgs.rb
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
Language.first_or_create(name: "English", abbreviation: "en-GB") ||
create(:language, name: "English", abbreviation: "en-GB")
end
is_other false
is_other { false }
contact_email { Faker::Internet.safe_email }
contact_name { Faker::Name.name }
trait :institution do
Expand Down