spout 0.13.0 → 0.14.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a9927bf8de637c19990fb3264282fa2ff60ea99eb9afca49536917527b94f5d
-  data.tar.gz: d26620208f2e603a45b40d0435e55eef688a3474c14dd3872c833f84262c06e9
+  metadata.gz: 70dea3c7337f2cfc3a38c1e59b5c8e9c94b7b009800b2680a3dcb06513331255
+  data.tar.gz: 4e63bf76cdbf26f4c4f387f15b454457a3e8a85677215f226b9060de38623072
 SHA512:
-  metadata.gz: f86764c1d0a8bda859330db2ec02ee16ba8ff30c16f1d37aad2a210148fd92f14966a304beb817736aa8e67ee5c92eb0bfba8828b553fb89996f4861fba559ed
-  data.tar.gz: d3ff0f0a21a95532b236d623b6bc74b85621d7ed1a05930f2bfa7fac7eb7c93d347c1aa077dd848f04e87fc72f4046abedf78714b3e9cf1c229b507902cea33d
+  metadata.gz: 542a18cc6f5e34c7df0f9ee1e7a848643bdb1e575176013fe1117becd81f715f32ca77ab150964b39aa66e3e76432d137e32b012680bc7d1f3b41e3435ac58f1
+  data.tar.gz: b85ffc0d3bba23f6af803c9d99ca47da3ac517ec840fd3d33f3c08d2a393067e68198de02f458f45cc206138f024151290b943746748cc7c55b86e4766670a35

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.14.0
+
+### Enhancements
+- **Framework Changes**
+  - Spout data dictionaries can now specify gem dependencies using `gems.rb`
+    instead of `Gemfile`
+- **Test Changes**
+  - Improved the spout testing framework
+    - Tests are now run excusively using `spout t` command
+    - Tests no longer spawn an extra process to run
+    - Rake dependency has been removed
+    - Failing tests no longer include an unnecessary rake backtrace
+
 ## 0.13.0 (June 21, 2018)
 
 ### Enhancements

data/README.md

@@ -13,7 +13,7 @@ Spout has been used extensively to curate and clean datasets available on the
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application's `gems.rb`:
 
     gem "spout"
 

data/Rakefile

@@ -6,6 +6,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "lib"
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"
+  t.warning = false
   t.verbose = false
 end
 

data/bin/spout

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require File.expand_path("../../lib/spout", __FILE__)
+require File.expand_path("../lib/spout", __dir__)
 
 Spout.launch(ARGV)

data/lib/spout/commands/project_generator.rb

@@ -26,7 +26,7 @@ Usage: spout new FOLDER
 The FOLDER must be empty or new.
 
 EOT
-        if @full_path == "" || (Dir.exist?(@full_path) && (Dir.entries(@full_path) & [".gitignore", ".ruby-version", ".travis.yml", "Gemfile", "Rakefile", "domains", "variables", "test"]).size > 0)
+        if @full_path == "" || (Dir.exist?(@full_path) && (Dir.entries(@full_path) & [".gitignore", ".ruby-version", ".travis.yml", "Gemfile", "gems.rb", "domains", "variables", "test"]).size > 0)
           puts usage
           exit(0)
         end
@@ -36,8 +36,7 @@ EOT
         copy_file "travis.yml", ".travis.yml"
         evaluate_file "spout.yml.erb", ".spout.yml"
         evaluate_file "CHANGELOG.md.erb", "CHANGELOG.md"
-        copy_file "Gemfile"
-        copy_file "Rakefile"
+        copy_file "gems.rb"
         evaluate_file "README.md.erb", "README.md"
         copy_file "VERSION"
         directory "domains"

data/lib/spout/commands/test_runner.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Spout
+  module Commands
+    # Runs spout tests.
+    class TestRunner
+      class << self
+        def run
+          new.run
+        end
+      end
+
+      def run
+        $LOAD_PATH.unshift File.join(Dir.pwd, "test")
+        Dir.glob(test_files, File::FNM_CASEFOLD).each do |test_file|
+          require test_file
+        end
+      end
+
+      def test_files
+        File.join(Dir.pwd, "test", "*_test.rb")
+      end
+    end
+  end
+end

data/lib/spout/commands/update.rb

@@ -25,12 +25,15 @@ module Spout
         if json
           if json["version"] == Spout::VERSION::STRING
             puts "The spout gem is " + "up-to-date".colorize(:green) + "!"
-            check_framework if File.exist?("Gemfile")
+            check_framework if File.exist?("Gemfile") || File.exist?("gems.rb")
           else
-            puts "A newer version (v#{json['version']}) is available!\n\n"
-            if File.exist?("Gemfile")
-              puts "Add the following to your Gemfile and run " + "bundle update".colorize(:green) + ".\n\n"
-              puts "  gem \"spout\", \"~> #{json['version']}\"\n".colorize(:white)
+            puts "A newer version (v#{json["version"]}) is available!\n\n"
+            if File.exist?("gems.rb")
+              puts "Add the following to gems.rb and run " + "bundle update".colorize(:green) + ".\n\n"
+              puts "  gem \"spout\", \"~> #{json["version"]}\"\n".colorize(:white)
+            elsif File.exist?("Gemfile")
+              puts "Add the following to Gemfile and run " + "bundle update".colorize(:green) + ".\n\n"
+              puts "  gem \"spout\", \"~> #{json["version"]}\"\n".colorize(:white)
             else
               puts "Type the following command to update:\n\n"
               puts "  gem install spout --no-document".colorize(:white) + "\n\n"

data/lib/spout/templates/gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 
 # Project Files
+/gems.locked
 /Gemfile.lock
 
 # Data Dictionary folders

data/lib/spout/templates/travis.yml

@@ -1,4 +1,4 @@
 sudo: false
 language: ruby
-rvm:
-  - 2.5.1
+rvm: 2.5.1
+script: spout test

data/lib/spout/version.rb

@@ -3,9 +3,9 @@
 module Spout
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 13
+    MINOR = 14
     TINY = 0
-    BUILD = nil # "pre", "rc", "rc2", nil
+    BUILD = "beta1" # "pre", "rc", "rc2", nil
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join(".").freeze
   end

data/lib/spout.rb

@@ -67,9 +67,8 @@ module Spout
   end
 
   def self.test(_argv)
-    system "bundle exec rake"
-    # require "spout/commands/test_runner"
-    # Spout::Commands::TestRunner.new(argv)
+    require "spout/commands/test_runner"
+    Spout::Commands::TestRunner.run
   end
 
   def self.update(argv)

data/spout.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bundler", "~> 1.16"
-  spec.add_dependency "rake"
   spec.add_dependency "minitest"
   spec.add_dependency "minitest-reporters"
   spec.add_dependency "json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0.beta1
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +103,7 @@ files:
 - lib/spout/commands/importer.rb
 - lib/spout/commands/outliers.rb
 - lib/spout/commands/project_generator.rb
+- lib/spout/commands/test_runner.rb
 - lib/spout/commands/update.rb
 - lib/spout/helpers/array_statistics.rb
 - lib/spout/helpers/chart_types.rb
@@ -156,13 +143,10 @@ files:
 - lib/spout/models/tables/numeric_vs_choices.rb
 - lib/spout/models/tables/numeric_vs_numeric.rb
 - lib/spout/models/variable.rb
-- lib/spout/tasks.rb
-- lib/spout/tasks/engine.rake
 - lib/spout/templates/CHANGELOG.md.erb
-- lib/spout/templates/Gemfile
 - lib/spout/templates/README.md.erb
-- lib/spout/templates/Rakefile
 - lib/spout/templates/VERSION
+- lib/spout/templates/gems.rb
 - lib/spout/templates/gitignore
 - lib/spout/templates/keep
 - lib/spout/templates/ruby-version

data/lib/spout/tasks/engine.rake

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/testtask"
-require "colorize"
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.warning = false
-  t.verbose = false
-end
-
-task default: :test

data/lib/spout/tasks.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# Load Spout rakefile extensions
-%w(
-  engine
-).each do |task|
-  # puts "Loading file: #{task}.rake"
-  load "spout/tasks/#{task}.rake"
-end

data/lib/spout/templates/Rakefile

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "spout/tasks"