changed reporters for progress bars (publiclab#2123)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,17 @@
-Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!
+Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
 
-* [ ] all tests pass -- `rake test:all`
-* [ ] code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
-* [ ] pull request is descriptively named with #number reference back to original issue
+* [ ] tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with `rake test`
+* [ ] code is in uniquely-named feature branch and has no merge conflicts
+* [ ] PR is descriptively titled
+* [ ] PR body includes `fixes #0000`-style reference to original issue #
+* [ ] ask `@publiclab/reviewers` for help, in a comment below
 
-Please be sure you've reviewed our contribution guidelines at https://publiclab.org/wiki/contributing-to-public-lab-software
+> We're happy to help you get this ready -- don't be afraid to ask for help, and **don't be discouraged** if your tests fail at first!
 
-We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on plots-dev@googlegroups.com when your request is ready or if you need assistance.
+If tests do fail, click on the red `X` to learn why by reading the logs.
+
+Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
+
+We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. 
 
 Thanks!

.github/first-timers-issue-template.md

@@ -14,8 +14,11 @@ Nothing. This issue is meant to welcome you to Open Source :) We are happy to wa
 
 - [ ] 🙋 **Claim this issue**: Comment below. If someone else has claimed it, ask if they've opened a pull request already and if they're stuck -- maybe you can help them solve a problem or move it along!
 
-- [ ] 📝 **Update** the file [$FILENAME]($BRANCH_URL) in the `$REPO` repository (press the little pen Icon) and edit the line as shown below. [See this page](https://github.com/publiclab/plots2/projects/2) for some help in taking your first steps!
+- [ ] 📝 **Update** the file [$FILENAME]($BRANCH_URL) in the `$REPO` repository (press the little pen Icon) and edit the line as shown below. 
 
+[See this page](https://publiclab.github.io/community-toolbox/#r=all) for some help in taking your first steps!
+
+Below is a "diff" showing in red (and a `-`) which lines to remove, and in green (and a `+`) which lines to add:
 
 ```diff
 $DIFF
@@ -39,6 +42,6 @@ Leave a comment below!
 
 ### Is someone else already working on this?
 
-We encourage you to link to this issue by mentioning the issue # in your pull request, so we can see if someone's already started on it. **If someone seem stuck, offer them some help!** Otherwise, [take a look at some other issues you can help with](https://github.com/publiclab/plots2/projects/2). Thanks!
+We encourage you to link to this issue by mentioning the issue # in your pull request, so we can see if someone's already started on it. **If someone seem stuck, offer them some help!** Otherwise, [take a look at some other issues you can help with](https://publiclab.github.io/community-toolbox/#r=all). Thanks!
 
 (This issue was created by [First-Timers-Bot](https://github.com/hoodiehq/first-timers-bot).)

.rubocop-http---shopify-github-io-ruby-style-guide-rubocop-yml

@@ -1082,7 +1082,7 @@ Performance/FlatMap:
 
 Performance/HashEachMethods:
   Enabled: true
-
+  
 Performance/LstripRstrip:
   Enabled: true
 

.rubocop.yml

@@ -15,4 +15,25 @@ AllCops:
     - 'log/*'
     - 'db/**/*'
     - 'Gemfile'
-  TargetRubyVersion: '2.4'
+    - 'config/**/*'
+    - 'script/**/*'
+    - 'lib/**/*'
+    - 'test/**/*'
+    - 'public/**/*'
+    - 'Dangerfile'
+  TargetRubyVersion: '2.4'
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Max: 303
+
+Metrics/ClassLength:
+  Max: 660
+
+Style/RegexpLiteral:
+  Enabled: false

CONTRIBUTING.md

@@ -3,43 +3,19 @@ Contributing to PLOTS2
 
 We welcome community contributions to PLOTS2! To install PLOTS2 locally, follow the instructions in the [README.md file](https://github.com/publiclab/plots2#installation).
 
-Learn more about contributing to PLOTS2 or other Public Lab code projects on these pages:
-
-* https://publiclab.org/wiki/developers
-* https://publiclab.org/wiki/contributing-to-public-lab-software
-
-## Bug reports & troubleshooting
-
-If you are submitting a bug, please include:
-
-* the URL you're on when you see the issue
-* the URL you just left, if you suspect your last action triggered the problem
-* your PublicLab.org username (if you have one)
-* your browser (and version if possible!) and operating system (Windows 7, Ubuntu Linux 14.x, etc)
-* anything you can about the sequence of events which led to the bug
-* any data you're attempting to upload, such as a photo, which can help us troubleshoot
+## First Timers Welcome!
 
+New to open source/free software? Here are a selection of issues we've made especially for first-timers. We're here to help, so just ask if one looks interesting:
 
+https://publiclab.github.io/community-toolbox/#r=all
 
-## First Timers
+Thank you so much!
 
-New to open source/free software? Here are a selection of issues we've made especially for first-timers. We're here to help, so just ask if one looks interesting : https://github.com/publiclab/plots2/projects/2
-We also have a slightly larger list of easy-ish but small and self contained issues: https://github.com/publiclab/plots2/labels/help-wanted
+Learn more about contributing to Public Lab code projects on these pages:
 
-When you think you've solved the bug and are ready to submit a pull request, please keep in mind the following:
+* https://publiclab.org/developers
+* https://publiclab.org/contributing-to-public-lab-software
 
-Make sure these boxes are checked before your pull request is ready to be reviewed and merged.
-* [ ] all tests pass -- `rake test:all`
-* [ ] code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
-* [ ] pull request is descriptively named with #number reference back to original issue
-* [ ] if possible, multiple commits squashed if they're smaller changes
-* [ ] reviewed/confirmed/tested by another contributor or maintainer
-* [ ] `schema.rb.example` has been updated if any database migrations were added
-
-Make sure you've reviewed our contribution guidelines at https://publiclab.org/wiki/contributing-to-public-lab-software
-
-Also, make sure to reference the issue no as "fixes #<issueno>" in your PRs, so that they can be auto-closed on merging.
-
-We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on plots-dev@googlegroups.com when your request is ready or if you need assistance.
+## Bug reports & troubleshooting
 
-Thank you for your help!
+If you are submitting a bug, please go to https://github.com/publiclab/plots2/issues/new

Dangerfile

@@ -55,6 +55,5 @@ begin
   end
 
 rescue => ex
-  puts "There was an error with Danger bot's Junit parsing:"
-  puts ex.message
+  fail "There was an error with Danger bot's Junit parsing: #{ex.message}"
 end

Dockerfile

@@ -11,11 +11,11 @@ RUN mkdir -p /app
 ENV HOME /root
 ENV PHANTOMJS_VERSION 2.1.1
 
-RUN echo \
-   'deb ftp://ftp.us.debian.org/debian/ jessie main\n \
-    deb ftp://ftp.us.debian.org/debian/ jessie-updates main\n \
-    deb http://security.debian.org jessie/updates main\n' \
-    > /etc/apt/sources.list
+#RUN echo \
+#   'deb ftp://ftp.us.debian.org/debian/ jessie main\n \
+#    deb ftp://ftp.us.debian.org/debian/ jessie-updates main\n \
+#    deb http://security.debian.org jessie/updates main\n' \
+#    > /etc/apt/sources.list
 
 # Install dependencies
 RUN apt-get update -qq && apt-get install -y bundler libmysqlclient-dev ruby-rmagick libfreeimage3 nodejs-legacy npm wget openjdk-7-jre openjdk-7-jdk procps

Gemfile

@@ -77,7 +77,7 @@ gem 'geokit-rails'
 
 gem 'rails_autolink'
 gem 'rb-readline'
-gem "paperclip", "~> 4.2.2"
+gem "paperclip", "~> 4.2.0"
 gem "ruby-openid", :require => "openid"
 gem "rack-openid"
 gem "authlogic", "~> 3.5.0"
@@ -110,3 +110,7 @@ gem 'jbuilder'
 
 # Pin mustermann to Ruby 2.1 compatible
 gem 'mustermann' , '~> 0.4'
+
+#OAuth Based login
+gem 'omniauth', '~> 1.3', '>= 1.3.1'
+gem 'omniauth-facebook', '~> 3.0'

Gemfile.lock

@@ -401,7 +401,7 @@ DEPENDENCIES
   mustermann (~> 0.4)
   mysql2 (~> 0.3.20)
   nifty-generators
-  paperclip (< 4.2.0)
+  paperclip (~> 4.2.0)
   passenger
   php-serialize
   progress_bar
@@ -435,3 +435,4 @@ DEPENDENCIES
 
 BUNDLED WITH
    1.16.1
+

README.md

@@ -13,13 +13,14 @@ It features a Bootstrap-based UI and a variety of community and attribution feat
 
 Some key features include:
 
-* a Markdown-based research note and wiki editor
+* a [Question and Answer system](https://publiclab.org/questions) for peer-based problem solving
+* a rich text and Markdown research note and wiki [editor](https://github.com/publiclab/PublicLab.Editor)
 * [wiki editing](https://publiclab.org/wiki) and revision tracking
-* tagging and tag-based content organization
+* tagging and [tag-based content organization](http://publiclab.org/tags)
 * email notification subscriptions for tags and comments
-* a barebones search interface
-* a user dashboard [presenting recent activity](https://publiclab.org/research)
-* a [Question and Answer system](https://publiclab.org/questions)
+* a search interface built out of [our growing API](https://github.com/publiclab/plots2/blob/master/doc/API.md)
+* a user dashboard [presenting recent activity](https://publiclab.org/dashboard)
+* a privacy-sensitive, Leaflet-based [location tagging system](https://github.com/publiclab/leaflet-blurred-location/) and [community map](http://publiclab.org/people)
 
 ![Diagram](https://publiclab.org/system/images/photos/000/021/061/original/diagram.png)
 
@@ -62,6 +63,10 @@ Please read and abide by our [Code of Conduct](https://publiclab.org/conduct); o
 12. Wheeeee! You're up and running! Log in with test usernames "user", "moderator", or "admin", and password "password".
 13. Run `rake test` to confirm that your install is working properly. For some setups, you may see warnings even if test pass; [see this issue](https://github.com/publiclab/plots2/issues/440) we're working to resolve.
 
+### Ruby version
+
+Make sure to use ruby-2.3.4. To check your ruby version run `ruby -v`.If you are using some other version then install ruby-2.3.4 with `rvm install 2.3.4`. Later to use ruby-2.3.4, run `rvm use 2.3.4`. Always make sure that you are using the correct ruby version since it might go back to its original version if you close the terminal. You might have to redo the entire installation process after switching to a different version. 
+
 ### Bundle exec
 
 For some, it will be necessary to prepend your gem-related commands with `bundle exec`, for example, `bundle exec passenger start`; adding `bundle exec` ensures you're using the version of passenger you just installed with Bundler. `bundle exec rake db: setup`, `bundle exec rake db: seed` are other examples of where this might be necessary.