react_on_rails 2.0.2 → 2.1.0

data/package.json

@@ -1,38 +1,40 @@
 {
   "name": "react-on-rails",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
     "doc": "docs"
   },
-  "dependencies": {},
+  "dependencies": {
+    "babel-types": "^6.4.5"
+  },
   "devDependencies": {
-    "babel": "^6.3.13",
-    "babel-cli": "^6.3.17",
-    "babel-core": "^6.3.17",
+    "babel": "^6.3.26",
+    "babel-cli": "^6.4.5",
+    "babel-core": "^6.4.5",
     "babel-eslint": "^5.0.0-beta6",
-    "babel-loader": "^6.2.0",
-    "babel-plugin-transform-runtime": "^6.3.13",
+    "babel-loader": "^6.2.1",
+    "babel-plugin-transform-runtime": "^6.4.3",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
-    "babel-runtime": "^6.3.13",
+    "babel-runtime": "^6.3.19",
     "babel-tape-runner": "^2.0.0",
     "babelify": "^7.2.0",
     "blue-tape": "^0.1.11",
     "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^2.1.1",
-    "eslint-config-shakacode": "0.0.1",
+    "eslint-config-airbnb": "^4.0.0",
+    "eslint-config-shakacode": "1.0.0",
     "eslint-plugin-babel": "^3.0.0",
-    "eslint-plugin-react": "^3.11.3",
-    "jscs": "^2.6.0",
-    "react": "^0.14.3",
-    "react-dom": "^0.14.3",
+    "eslint-plugin-react": "^3.16.1",
+    "jscs": "^2.8.0",
+    "react": "^0.14.6",
+    "react-dom": "^0.14.6",
     "react-transform-hmr": "^1.0.1",
     "tap-spec": "^4.1.1",
     "tape": "^4.4.0",
-    "webpack": "^1.12.9"
+    "webpack": "^1.12.12"
   },
   "peerDependencies": {
     "react": ">= 0.14",
@@ -47,7 +49,9 @@
     "symlink-node-package": "node_package/scripts/symlink-node-package",
     "prepublish": "npm run build",
     "build": "node_package/scripts/build",
-    "lint": "node_package/scripts/lint && cd spec/dummy/client && npm run lint",
+    "eslint": "eslint . --ext .jsx and .js",
+    "jscs": "jscs . -e -v",
+    "lint": "npm run eslint && npm run jscs",
     "lint:fix": "node_package/scripts/lint-fix",
     "check": "npm run lint && npm run test",
     "prerelease": "npm run check && npm run clean && npm run build",

data/rakelib/example_type.rb

@@ -18,7 +18,7 @@ module ReactOnRails
 
       attr_reader :name, :generator_options
 
-      def initialize(name:, generator_options:)
+      def initialize(name: nil, generator_options: nil)
         @name = name
         @generator_options = generator_options
         self.class.all << self
@@ -86,13 +86,12 @@ module ReactOnRails
         "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
       end
 
-      # Methods for retrieving the name of a task specific to the example type
       %w(gen prepare clean clobber npm_install build_webpack_bundles).each do |task_type|
-        method = "#{task_type}_task_name"      # ex: `clean_task_name`
-        task_name = "#{task_type}_#{name}"     # ex: `clean_basic`
+        method_name_normal = "#{task_type}_task_name"          # ex: `clean_task_name`
+        method_name_short = "#{method_name_normal}_short"      # ex: `clean_task_name_short`
 
-        define_method(method) { "#{self.class.namespace_name}:#{task_name}" }
-        define_method("#{method}_short") { task_name }
+        define_method(method_name_normal) { "#{self.class.namespace_name}:#{task_type}_#{name}" }
+        define_method(method_name_short) { "#{task_type}_#{name}" }
       end
 
       def rspec_task_name_short

data/rakelib/examples.rake

@@ -64,6 +64,7 @@ namespace :examples do
     task example_type.gen_task_name_short => example_type.clean_task_name do
       mkdir_p(example_type.dir)
       sh_in_dir(examples_dir, "rails new #{example_type.name} #{example_type.rails_options}")
+      sh_in_dir(example_type.dir, "touch .gitignore")
       append_to_gemfile(example_type.gemfile, example_type.required_gems)
       bundle_install_in(example_type.dir)
       sh_in_dir(example_type.dir, example_type.generator_shell_commands)

data/rakelib/lint.rake

@@ -20,12 +20,12 @@ namespace :lint do
 
   desc "Run eslint as shell"
   task :eslint do
-    sh_in_dir(gem_root, "$(npm bin)/eslint . --ext .jsx and .js")
+    sh_in_dir(gem_root, "npm run eslint")
   end
 
   desc "Run jscs from shell"
   task :jscs do
-    sh_in_dir(gem_root, "$(npm bin)/jscs -e -v .")
+    sh_in_dir(gem_root, "npm run jscs")
   end
 
   desc "Run all eslint, jscs, rubocop linters. Skip ruby-lint and scss"

data/rakelib/release.rake

@@ -0,0 +1,70 @@
+require_relative "task_helpers"
+include ReactOnRails::TaskHelpers
+require_relative File.join(gem_root, "lib", "react_on_rails", "version_syntax_converter")
+require_relative File.join(gem_root, "lib", "react_on_rails", "git_utils")
+require_relative File.join(gem_root, "lib", "react_on_rails", "utils")
+
+desc("Releases both the gem and node package using the given version.
+
+IMPORTANT: the gem version must be in valid rubygem format (no dashes).
+It will be automatically converted to a valid npm semver by the rake task
+for the node package version. This only makes a difference for pre-release
+versions such as `3.0.0.beta.1` (npm version would be `3.0.0-beta.1`).
+
+This task will also globally install gem-release (ruby gem) and
+release-it (node package) unless you specify skip installing tools.
+
+1st argument: The new version in rubygem format (no dashes). Pass no argument to
+              automatically perform a patch version bump.
+2nd argument: Perform a dry run by passing 'true' as a second argument.
+3rd argument: Skip installing tools by passing 'false' as a third argument (default is true).
+
+Example: `rake release[2.1.0,false,false]`")
+
+task :release, [:gem_version, :dry_run, :tools_install] do |_t, args|
+  class MessageHandler
+    def add_error(error)
+      fail error
+    end
+  end
+
+  # Check if there are uncommited changes
+  ReactOnRails::GitUtils.uncommitted_changes?(MessageHandler.new)
+  args_hash = args.to_hash
+
+  is_dry_run = ReactOnRails::Utils.object_to_boolean(args_hash[:dry_run])
+  should_install_tools = ReactOnRails::Utils.object_to_boolean(args_hash.fetch(:tools_install, true))
+
+  gem_version = args_hash.fetch(:gem_version, "")
+
+  npm_version = if gem_version.strip.empty?
+                  ""
+                else
+                  VersionSyntaxConverter.new.rubygem_to_npm(gem_version)
+                end
+
+  # Having the examples prevents publishing
+  Rake::Task["examples:clobber"].invoke
+
+  # See https://github.com/svenfuchs/gem-release
+  sh_in_dir(gem_root, "gem install gem-release") if should_install_tools
+  sh_in_dir(gem_root, "gem bump --no-commit #{gem_version.strip.empty? ? '' : %(--version #{gem_version})}")
+
+  # Update dummy app's Gemfile.lock
+  bundle_install_in(dummy_app_dir)
+
+  # Stage changes so far
+  sh_in_dir(gem_root, "git add .")
+
+  # See https://www.npmjs.com/package/release-it
+  sh %(npm install release-it -g) if should_install_tools
+
+  # Will bump the npm version, commit, tag the commit, push to repo, and release on npm
+  release_it_command = "release-it --non-interactive --npm.publish"
+  release_it_command << " --dry-run --verbose" if is_dry_run
+  release_it_command << " #{npm_version}" unless npm_version.strip.empty?
+  sh_in_dir(gem_root, release_it_command)
+
+  # Release the new gem version
+  sh_in_dir(gem_root, "gem release") unless is_dry_run
+end

data/rakelib/run_rspec.rake

@@ -9,18 +9,18 @@ include ReactOnRails::TaskHelpers
 namespace :run_rspec do
   desc "Run RSpec for top level only"
   task :gem do
-    run_tests_in("", rspec_args: "spec/react_on_rails")
+    run_tests_in("", rspec_args: File.join("spec", "react_on_rails"))
   end
 
   task dummy: ["dummy_apps:dummy_app"] do
-    run_tests_in("spec/dummy", env_vars: "DRIVER=selenium_firefox")
+    run_tests_in(File.join("spec", "dummy"), env_vars: "DRIVER=selenium_firefox")
   end
 
   # Dynamically define Rake tasks for each example app found in the examples directory
   ExampleType.all.each do |example_type|
     desc "Runs RSpec for #{example_type.name_pretty} only"
     task example_type.rspec_task_name_short => example_type.prepare_task_name do
-      run_tests_in("#{File.basename(examples_dir)}/#{example_type.name}") # have to use relative path
+      run_tests_in(File.join(examples_dir, example_type.name)) # have to use relative path
     end
   end
 
@@ -52,14 +52,23 @@ task run_rspec: ["run_rspec:run_rspec"]
 
 private
 
-# Runs rspec in the given directory (if string is passed, assumed to be relative
-# to root of the gem.
+# Runs rspec in the given directory.
+# If string is passed and it's not absolute, it's converted relative to root of the gem.
 # TEST_ENV_COMMAND_NAME is used to make SimpleCov.command_name unique in order to
 # prevent a name collision. Defaults to the given directory's name.
 def run_tests_in(dir, options = {})
-  dir = Pathname.new(File.join(gem_root, dir)) if dir.is_a?(String)
-  command_name = options.fetch(:command_name, dir.basename)
+  if dir.is_a?(String)
+    path = if dir.start_with?(File::SEPARATOR)
+             Pathname.new(dir)
+           else
+             Pathname.new(File.join(gem_root, dir))
+           end
+  else
+    path = dir
+  end
+
+  command_name = options.fetch(:command_name, path.basename)
   rspec_args = options.fetch(:rspec_args, "")
   env_vars = %(#{options.fetch(env_vars, '')} COVERAGE=true TEST_ENV_COMMAND_NAME="#{command_name}")
-  sh_in_dir(dir, "#{env_vars} bundle exec rspec #{rspec_args}")
+  sh_in_dir(path.realpath, "#{env_vars} bundle exec rspec #{rspec_args}")
 end

data/rakelib/task_helpers.rb

@@ -7,10 +7,10 @@ module ReactOnRails
 
     # Returns the folder where examples are located
     def examples_dir
-      File.join(gem_root, "examples")
+      File.join(gem_root, "gen-examples", "examples")
     end
 
-    def dummy_app_dirs
+    def dummy_app_dir
       File.join(gem_root, "spec/dummy")
     end
 
@@ -25,7 +25,7 @@ module ReactOnRails
     end
 
     # Runs bundle exec using that directory's Gemfile
-    def bundle_exec(dir:, args:, env_vars: "")
+    def bundle_exec(dir: nil, args: nil, env_vars: "")
       sh_in_dir(dir, "#{env_vars} #{args}")
     end
 

data/react_on_rails.gemspec

@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
   s.homepage      = "https://github.com/shakacode/react_on_rails"
   s.license       = "MIT"
 
-  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples|node_modules|node_package|coverage)/}) }
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|gen-examples|tmp|node_modules|node_package|coverage)/}) }
   s.bindir        = "exe"
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency "connection_pool"
   s.add_dependency "execjs", "~> 2.5"
-  s.add_dependency "rainbow", "~> 2.0"
+  s.add_dependency "rainbow", "~> 2.1"
   s.add_dependency "rails", ">= 3.2"
 
   s.add_development_dependency "bundler", "~> 1.10"

data/script/release

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-echo see docs/releasing.md
+echo "See `rake -D release`"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -294,15 +294,20 @@ files:
 - docs/additional_reading/optional_configuration.md
 - docs/additional_reading/react-and-redux.md
 - docs/additional_reading/react_router.md
+- docs/additional_reading/rspec_configuration.md
 - docs/additional_reading/server_rendering_tips.md
 - docs/additional_reading/tips.md
+- docs/additional_reading/turbolinks.md
+- docs/additional_reading/updating-dependencies.md
 - docs/additional_reading/webpack.md
 - docs/code_of_conduct.md
 - docs/coding-style/linters.md
 - docs/coding-style/style.md
 - docs/contributing.md
+- docs/doctrine.md
 - docs/generator_testing.md
 - docs/rails3.md
+- docs/recommended-project-structure.md
 - docs/releasing.md
 - docs/tutorial-v2.md
 - lib/generators/USAGE
@@ -374,11 +379,15 @@ files:
 - lib/react_on_rails.rb
 - lib/react_on_rails/configuration.rb
 - lib/react_on_rails/engine.rb
+- lib/react_on_rails/ensure_assets_compiled.rb
+- lib/react_on_rails/git_utils.rb
 - lib/react_on_rails/prerender_error.rb
 - lib/react_on_rails/server_rendering_pool.rb
+- lib/react_on_rails/utils.rb
 - lib/react_on_rails/version.rb
 - lib/react_on_rails/version_checker.rb
 - lib/react_on_rails/version_syntax_converter.rb
+- npm-shrinkwrap.json
 - package.json
 - rakelib/docker.rake
 - rakelib/dummy_apps.rake
@@ -387,6 +396,7 @@ files:
 - rakelib/examples_config.yml
 - rakelib/lint.rake
 - rakelib/node_package.rake
+- rakelib/release.rake
 - rakelib/run_rspec.rake
 - rakelib/task_helpers.rb
 - react_on_rails.gemspec