react_on_rails 2.0.0.beta.3 → 2.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e6a3e3f5a956072da985398fcc4a47717c1c654
-  data.tar.gz: 54dd160efba8dfe5ce0c35c2d56fb326f5e82984
+  metadata.gz: 1a3532d98dcdbf8b585e955a5c605d9c884ac6df
+  data.tar.gz: f7b3342e9599a2ba77087bb44b4004ac38eac4df
 SHA512:
-  metadata.gz: 7f6910bd7f55013c68d046febb69b0b709cb470351b2ce008a66580336cd9a540e1f7cf97f7480bb0a617c681e4004b284785db8e1d4d7eb75dab1a417a811cb
-  data.tar.gz: cfbb296cbd1b90af417facd4850292eb9f76a705eadd380535dd9d50b2fdba1000212d7c46b2d248dc325bd7f6b0eab519543afecb6d436093adf616589973dc
+  metadata.gz: d6524e9358002a3124ffbf24620de5b7c4234ce78bf2a2851f8b32093c0d75f8189602b0a972ba94e0f4df7808fe1e29922fe680283e4ce655b7a8c9f3c2a466
+  data.tar.gz: 35510b925a6828dac60290ad1cb6ca803e2726f412d032d06c4338bc18fa0373b8a5261c15519c8b648a3197609e86ef76da045fedd4beede3f42bd3f5792603

data/.travis.yml

@@ -30,12 +30,12 @@ install:
   - npm install
   - rake dummy_apps
   - rake examples
+  - rake node_package
   - docker-compose up lint
 
 before_script:
   - "export DISPLAY=:99"
   - Xvfb :99 -ac -screen scn 1600x1200x16 &
-  - npm run symlink_node_package
 
 script:
   - rake

data/Rakefile

@@ -1,10 +1,7 @@
 # Rake will automatically load any *.rake files inside of the "rakelib" folder
 # See rakelib/
+require "coveralls/rake/task"
+Coveralls::RakeTask.new
 
 desc "Run all tests and linting"
-task default: ["run_rspec", "docker:lint"]
-
-desc "Has all examples and dummy apps use local node_package folder for react-on-rails node dependency"
-task :symlink_node_package do
-  sh_in_dir(gem_root, "npm run symlink_node_package")
-end
+task default: ["run_rspec", "docker:lint", "coveralls:push"]

data/docs/contributing.md

@@ -90,9 +90,18 @@ From now on, the example and dummy apps will use your local node_package folder
 ```sh
 cd <top level>
 npm i
-npm run build
-cd spec/dummy
-npm i
+npm build
+```
+
+Or run this which builds the npm package, then the webpack files for spec/dummy, and runs tests in
+spec/dummy.
+
+
+```sh
+# Optionally change default selenium_firefox driver
+export DRIVER=poltergeist
+cd <top level>
+npm dummy:spec
 ```
 
 ### Run NPM JS tests

data/docs/releasing.md

@@ -27,3 +27,18 @@ gem release
 Be sure to keep the version number the same as the ruby gem!
 
 Use the npm package `release-it`
+
+### Commands Used for Pushing Beta
+
+Note the npm beta version has a dash and the gem version has a dot.
+
+```
+gem bump -v 2.0.0.beta.3
+gem tag
+cd spec/dummy && bundle
+ga Gemfile.lock
+gc -m "Update Gemfile.lock for spec/dummy"
+...
+gem release
+release-it 2.0.0-beta.3
+```

data/lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/reducers/helloWorldReducer.jsx

@@ -10,10 +10,10 @@ export default function helloWorldReducer($$state = $$initialState, action) {
   const { type, name } = action;
 
   switch (type) {
-    case actionTypes.HELLO_WORLD_NAME_UPDATE:
-      return $$state.set('name', name);
+  case actionTypes.HELLO_WORLD_NAME_UPDATE:
+    return $$state.set('name', name);
 
-    default:
-      return $$state;
+  default:
+    return $$state;
   }
 }

data/lib/react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactOnRails
-  VERSION = "2.0.0.beta.3"
+  VERSION = "2.0.0.rc.1"
 end

data/lib/react_on_rails/version_checker.rb

@@ -13,10 +13,8 @@ module ReactOnRails
     # For compatibility, the gem and the node package versions should always match, unless the user
     # really knows what they're doing. So we will give a warning if they do not.
     def self.warn_if_gem_and_node_package_versions_differ
-      return unless
-        File.exist?(client_package_json) &&
-        node_package_version_is_standard_version_number? &&
-        gem_version != node_package_version
+      return unless node_package_version_is_standard_version_number? &&
+                    gem_version != node_package_version
       msg = "**WARNING** ReactOnRails: ReactOnRails gem and node package versions do not match\n" \
             "                     gem: #{gem_version}\n" \
             "            node package: #{node_package_version}\n" \
@@ -33,14 +31,15 @@ module ReactOnRails
 
     # Warning: we replace all hyphens with periods for normalization purposes
     def self.node_package_version
-      package_json = client_package_json
-      contents = File.read(package_json)
+      return unless client_package_json.present? && File.exist?(client_package_json)
+      contents = File.read(client_package_json)
       raw_version = contents.match(/"react-on-rails": "(.*)",/)[1]
       raw_version.tr("-", ".")
     end
 
     def self.client_package_json
-      package_json = Rails.root.join("client", "package.json")
+      return unless Rails.root.present?
+      Rails.root.join("client", "package.json")
     end
 
     # Basically this means "not a relative path" as we don't want warn the user

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/dummy_apps.rake

@@ -6,6 +6,8 @@ namespace :dummy_apps do
     dummy_app_dir = File.join(gem_root, "spec/dummy")
     bundle_install_in(dummy_app_dir)
     dummy_app_client_dir = File.join(dummy_app_dir, "client")
+
+    # Note, we do not put in "npm build" as npm install does that!
     sh_in_dir(dummy_app_client_dir, ["npm install",
                                      "$(npm bin)/webpack --config webpack.server.js",
                                      "$(npm bin)/webpack --config webpack.client.js"])

data/rakelib/examples.rake

@@ -72,7 +72,7 @@ namespace :examples do
     # PREPARE
     desc "Prepares #{example_type.name_pretty} (generates example, `npm install`s, and generates webpack bundles)"
     multitask example_type.prepare_task_name_short => example_type.prepared_files do
-      Rake::Task[:refresh_node_package].invoke
+      Rake::Task["node_package"].invoke
     end
   end
 

data/rakelib/node_package.rake

@@ -5,7 +5,14 @@ namespace :node_package do
   task :build do
     sh 'npm run build'
   end
+
+  desc "Has all examples and dummy apps use local node_package folder for react-on-rails node dependency"
+  task :symlink do
+    sh_in_dir(gem_root, "npm run symlink-node-package")
+  end
 end
 
-desc "Prepares all node_package by building"
-task node_package: ["node_package:build"]
+desc "Prepares node_package by building and symlinking any example/dummy apps present"
+task node_package: "node_package:build" do
+  Rake::Task["node_package:symlink"].invoke
+end

data/rakelib/run_rspec.rake

@@ -37,7 +37,7 @@ namespace :run_rspec do
   Coveralls::RakeTask.new
 
   desc "run all tests"
-  task run_rspec: [:gem, :dummy, :examples, :empty, :js_tests, "coveralls:push"] do
+  task run_rspec: [:gem, :dummy, :examples, :empty, :js_tests] do
     puts "Completed all RSpec tests"
   end
 end

data/script/bootstrap

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# script/bootstrap: Resolve all dependencies that the application requires to
+#                   run.
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+if [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ]; then
+  brew update
+
+  brew bundle check 2>&1 >/dev/null || {
+    echo "==> Installing Homebrew dependencies…"
+    brew bundle
+  }
+fi
+
+if [ -f ".ruby-version" ] && [ -z "$(rbenv version-name 2>/dev/null)" ]; then
+  echo "==> Installing Ruby…"
+  rbenv install --skip-existing
+  which bundle 2>&1 >/dev/null || {
+    gem install bundler
+    rbenv rehash
+  }
+fi
+
+if [ -f "Gemfile" ]; then
+  echo "==> Installing gem dependencies…"
+  bundle check --path vendor/gems 2>&1 >/dev/null || {
+    bundle install --path vendor/gems --quiet --without production
+  }
+fi

data/script/release

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo see docs/releasing.md

data/script/setup

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# script/setup: Set up application for the first time after cloning, or set it
+#               back to the initial first unused state.
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+script/bootstrap
+
+echo "===> Setting up DB..."
+# reset database to a fresh state.
+bin/rake db:create db:reset
+
+if [ -z "$RAILS_ENV" ] && [ -z "$RACK_ENV" ]; then
+  # Only things for a development environment will run inside here
+  # Do things that need to be done to the application to set up for the first
+  # time. Or things needed to be run to to reset the application back to first
+  # use experience. These things are scoped to the application's domain.
+fi
+
+echo "==> App is now ready to go!"

data/script/test

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# script/test: Run test suite for application. Optionally pass in a path to an
+#              individual test file to run a single test.
+
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+[ -z "$DEBUG" ] || set -x
+
+export RACK_ROOT=$(cd "$(dirname $0)"/.. && pwd)
+
+if [ "$RAILS_ENV" = "test" ] || [ "$RACK_ENV" = "test" ]; then
+  # if executed and the environment is already set to `test`, then we want a
+  # clean from scratch application. This almost always means a ci environment,
+  # since we set the environment to `test` directly in `script/cibuild`.
+  script/setup
+else
+  # if the environment isn't set to `test`, set it to `test` and update the
+  # application to ensure all dependencies are met as well as any other things
+  # that need to be up to date, like db migrations. The environement not having
+  # already been set to `test` almost always means this is being called on it's
+  # own from a `development` environment.
+  export RAILS_ENV="test" RACK_ENV="test"
+
+  script/update
+fi
+
+echo "===> Running tests..."
+
+if [ -n "$1" ]; then
+  # pass arguments to test call. This is useful for calling a single test.
+  bin/rake test "$1"
+else
+  bin/rake test
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.3
+  version: 2.0.0.rc.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,6 +247,10 @@ files:
 - rakelib/task_helpers.rb
 - react_on_rails.gemspec
 - ruby-lint.yml
+- script/bootstrap
+- script/release
+- script/setup
+- script/test
 homepage: https://github.com/shakacode/react_on_rails
 licenses:
 - MIT