skellington 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9cfadd02678c94f3e7086f19738dfe59a1942b7
-  data.tar.gz: 1a636831eaa0cf82be43debf681db927273e2058
+  metadata.gz: 4200cea11887c45594dd4eb6ef40e24f0d68131d
+  data.tar.gz: c392b90548b4f2c635c8e3cf0566d49f689a23c0
 SHA512:
-  metadata.gz: ed3f2ec26f7ef88dc1a99449313a2dfad7401bf938424b8b8f8fd1d41c2a91bb1ace5300e1fef6582038d21a9bcb7a0cb163037d46362183ab50a200ce5debf7
-  data.tar.gz: 0061d7fd850e8686a9fb7fb091c2f4e11a9982e3564381acd9c1a4a600e4ae60eade81fd4eafcf7cf1fb917c9cd08b2ebcad0c273c1ddf447669ff3d46b07280
+  metadata.gz: bcf0cd22bb591abfe073886523d1956334210b47e0e46237a518e663e2787e4dc4d05d1dcb22b1ae26af839fbc7b06c086c668a07f2c2c61c505d2f67599a894
+  data.tar.gz: 5db49c880a4657a7e08a0b3431ace03adce16dea3e480d5299ae34b74c7547f589b319d600e901f82094c895f2da80a6f990aa1462a4b24e36598a4749f90a61

data/Guardfile

@@ -1,37 +1,3 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec feature)
-
-## Uncomment to clear the screen before every task
-# clearing :on
-
-## Guard internally checks for changes in the Guardfile and exits.
-## If you want Guard to automatically start up again, run guard in a
-## shell loop, e.g.:
-##
-##  $ while bundle exec guard; do echo "Restarting Guard..."; done
-##
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), the you will want to move the Guardfile
-## to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
-
-# Note: The cmd option is now required due to the increasing number of ways
-#       rspec may be run, below are examples of the most common uses.
-#  * bundler: 'bundle exec rspec'
-#  * bundler binstubs: 'bin/rspec'
-#  * spring: 'bin/rspec' (This will use spring if running and you have
-#                          installed the spring binstubs per the docs)
-#  * zeus: 'zeus rspec' (requires the server to be started separately)
-#  * 'just' rspec: 'rspec'
-
 guard :rspec, cmd: "bundle exec rspec" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
@@ -47,40 +13,4 @@ guard :rspec, cmd: "bundle exec rspec" do
   # Ruby files
   ruby = dsl.ruby
   dsl.watch_spec_files_for(ruby.lib_files)
-
-  # Rails files
-  rails = dsl.rails(view_extensions: %w(erb haml slim))
-  dsl.watch_spec_files_for(rails.app_files)
-  dsl.watch_spec_files_for(rails.views)
-
-  watch(rails.controllers) do |m|
-    [
-      rspec.spec.("routing/#{m[1]}_routing"),
-      rspec.spec.("controllers/#{m[1]}_controller"),
-      rspec.spec.("acceptance/#{m[1]}")
-    ]
-  end
-
-  # Rails config changes
-  watch(rails.spec_helper)     { rspec.spec_dir }
-  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
-  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
-
-  # Capybara features specs
-  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
-    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
-  end
-end
-
-guard "cucumber" do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { "features" }
-
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) do |m|
-    "features"
-  end
 end

data/config/config.yaml

@@ -1,20 +1,20 @@
 gems:
   production:
     - sinatra
-    - puma
-    - rake
     - rack-conneg
+    - rake
+    - puma
 
   test:
     - cucumber
-    - capybara
-    - coveralls
-    - jasmine
     - rspec
+    - guard
     - guard-rspec
     - guard-jasmine
-    - guard
     - guard-cucumber
+    - capybara
+    - coveralls
+    - jasmine
     - pry
     - actionpack
 
@@ -23,10 +23,12 @@ gems:
 
 files:
   Gemfile:
+  Guardfile:
   Rakefile:
   Procfile:
   .ruby-version:
   .rspec:
+  .gitignore:
   config.ru:
   # the template has this name
   features/first.feature:

data/lib/skellington/version.rb

@@ -1,3 +1,3 @@
 module Skellington
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/templates/.gitignore.eruby

@@ -0,0 +1 @@
+coverage/

data/lib/templates/Guardfile.eruby

@@ -0,0 +1,28 @@
+guard :cucumber do
+  watch %r{^features/.+\.feature$}
+  watch(%r{^features/support/.+$}) { 'features' }
+
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || 'features'
+  end
+end
+
+guard :jasmine do
+  watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$}) { 'spec/javascripts' }
+  watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
+  watch(%r{spec/javascripts/fixtures/.+$})
+  watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m| "spec/javascripts/#{ m[1] }_spec.#{ m[2] }" }
+end
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/spec/cli/app_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates an app file' do
       subject.generate 'dummy_app'
-      expect('dummy_app/lib/dummy_app.rb').to contain (
+      expect('dummy_app/lib/dummy_app.rb').to have_content (
       """
       require 'sinatra/base'
       require 'tilt/erubis'
@@ -43,7 +43,7 @@ module Skellington
       """
       )
 
-      expect('dummy_app/lib/dummy_app/racks.rb').to contain (
+      expect('dummy_app/lib/dummy_app/racks.rb').to have_content (
       """
       require 'rack/conneg'
 
@@ -72,7 +72,7 @@ module Skellington
       """
       )
 
-      expect('dummy_app/lib/dummy_app/helpers.rb').to contain (
+      expect('dummy_app/lib/dummy_app/helpers.rb').to have_content (
       """
       module DummyApp
         module Helpers

data/spec/cli/bootstrap_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a bootstrap template' do
       subject.generate 'dummy_app'
-      expect('dummy_app/views/default.erb').to contain (
+      expect('dummy_app/views/default.erb').to have_content (
       """
       <!DOCTYPE html>
       <html lang='en'>
@@ -26,7 +26,7 @@ module Skellington
       """
       )
 
-      expect('dummy_app/views/includes/header.erb').to contain (
+      expect('dummy_app/views/includes/header.erb').to have_content (
       """
       <head>
         <meta charset='utf-8' />
@@ -52,7 +52,7 @@ module Skellington
       </head>
       """
       )
-      expect('dummy_app/views/index.erb').to contain (
+      expect('dummy_app/views/index.erb').to have_content (
       """
       <%= @content %>
       """

data/spec/cli/config_ru_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a config.ru file' do
       subject.generate 'dummy_app'
-      expect('dummy_app/config.ru').to contain (
+      expect('dummy_app/config.ru').to have_content (
       """
       require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb')
 

data/spec/cli/cukes_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates some cucumber file' do
       subject.generate 'dummy_app'
-      expect('dummy_app/features/dummy_app.feature').to contain (
+      expect('dummy_app/features/dummy_app.feature').to have_content (
       """
       Feature: Make sure DummyApp is plumbed in correctly
 
@@ -16,7 +16,7 @@ module Skellington
       """
       )
 
-      expect('dummy_app/features/json.feature').to contain (
+      expect('dummy_app/features/json.feature').to have_content (
       """
       Feature: Get JSON
 
@@ -30,7 +30,7 @@ module Skellington
       """
       )
 
-      expect('dummy_app/features/support/env.rb').to contain (
+      expect('dummy_app/features/support/env.rb').to have_content (
       """
       ENV['RACK_ENV'] = 'test'
 

data/spec/cli/gemfile_spec.rb

@@ -6,27 +6,27 @@ module Skellington
 
     it 'generates a Gemfile' do
       subject.generate 'dummy_app'
-      expect('dummy_app/Gemfile').to contain (
+      expect('dummy_app/Gemfile').to have_content (
       """
       source 'https://rubygems.org'
 
-      /ruby [0-9]*\.[0-9]*\.[0-9]*/
+      /ruby '[0-9]*\\.[0-9]*\\.[0-9]*'/
 
       gem 'sinatra'
-      gem 'puma'
-      gem 'rake'
       gem 'rack-conneg'
+      gem 'rake'
+      gem 'puma'
 
       group :test do
         gem 'cucumber'
-        gem 'capybara'
-        gem 'coveralls'
-        gem 'jasmine'
         gem 'rspec'
+        gem 'guard'
         gem 'guard-rspec'
         gem 'guard-jasmine'
-        gem 'guard'
         gem 'guard-cucumber'
+        gem 'capybara'
+        gem 'coveralls'
+        gem 'jasmine'
         gem 'pry'
         gem 'actionpack'
         gem 'cucumber-api-steps', require: false

data/spec/cli/git_spec.rb

@@ -4,9 +4,15 @@ module Skellington
       described_class.new
     end
 
-    it 'generates a Gemfile' do
+    it 'initialises a git repo' do
       subject.generate 'dummy_app'
       expect(Dir).to exist 'dummy_app/.git'
+
+      expect('dummy_app/.gitignore').to have_content (
+      """
+      coverage/
+      """
+      )
     end
   end
 end

data/spec/cli/guardfile_spec.rb

@@ -0,0 +1,43 @@
+module Skellington
+  describe CLI do
+    let :subject do
+      described_class.new
+    end
+
+    it 'generates a Guardfile' do
+      subject.generate 'dummy_app'
+      expect('dummy_app/Guardfile').to have_content (
+      """
+      guard :cucumber do
+        /watch/
+        /watch/
+
+        /watch/
+          /Dir/
+        end
+      end
+
+      guard :jasmine do
+        /watch/
+        /watch/
+        /watch/
+        /watch/
+      end
+
+      guard :rspec, cmd: 'bundle exec rspec' do
+        require 'guard/rspec/dsl'
+        dsl = Guard::RSpec::Dsl.new(self)
+
+        rspec = dsl.rspec
+        watch(rspec.spec_helper) { rspec.spec_dir }
+        watch(rspec.spec_support) { rspec.spec_dir }
+        watch(rspec.spec_files)
+
+        ruby = dsl.ruby
+        dsl.watch_spec_files_for(ruby.lib_files)
+      end
+      """
+      )
+    end
+  end
+end

data/spec/cli/javascript_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates javascript files' do
       subject.generate 'dummy_app'
-      expect('dummy_app/spec/javascripts/support/jasmine.yml').to contain (
+      expect('dummy_app/spec/javascripts/support/jasmine.yml').to have_content (
       """
       src_files:
         - public/js/**/*.js
@@ -28,7 +28,7 @@ module Skellington
 
       expect(File).to exist 'dummy_app/spec/javascripts/support/jasmine_helper.rb'
 
-      expect('dummy_app/spec/javascripts/dummy_appSpec.js').to contain (
+      expect('dummy_app/spec/javascripts/dummy_appSpec.js').to have_content (
       """
       describe('DummyApp', function() {
         it('knows the truth', function() {

data/spec/cli/non_local_path_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates an app at a non-local path' do
       subject.generate 'subdir/some_app'
-      expect('subdir/some_app/lib/some_app.rb').to contain (
+      expect('subdir/some_app/lib/some_app.rb').to have_content (
       """
       require 'sinatra/base'
       require 'tilt/erubis'
@@ -43,7 +43,7 @@ module Skellington
       """
       )
 
-      expect('subdir/some_app/config.ru').to contain (
+      expect('subdir/some_app/config.ru').to have_content (
       """
       require File.join(File.dirname(__FILE__), 'lib/some_app.rb')
 

data/spec/cli/procfile_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a Procfile' do
       subject.generate 'dummy_app'
-      expect('dummy_app/Procfile').to contain (
+      expect('dummy_app/Procfile').to have_content (
       """
       web: bundle exec ruby lib/dummy_app.rb
       """

data/spec/cli/rakefile_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a Rakefile' do
       subject.generate 'dummy_app'
-      expect('dummy_app/Rakefile').to contain (
+      expect('dummy_app/Rakefile').to have_content (
       """
       require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb')
 

data/spec/cli/rbenv_spec.rb

@@ -7,9 +7,9 @@ module Skellington
     it 'generates a .ruby-version' do
       subject.generate 'dummy_app'
       expect(File).to exist 'dummy_app/.ruby-version'
-      expect('dummy_app/.ruby-version').to contain (
+      expect('dummy_app/.ruby-version').to have_content (
       """
-      /[0-9]*\.[0-9]*\.[0-9]*/
+      /[0-9]*\\.[0-9]*\\.[0-9]*/
       """
       )
     end

data/spec/cli/spec_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates rspec files' do
       subject.generate 'dummy_app'
-      expect('dummy_app/spec/spec_helper.rb').to contain (
+      expect('dummy_app/spec/spec_helper.rb').to have_content (
       """
       require 'coveralls'
       Coveralls.wear_merged!
@@ -27,7 +27,7 @@ module Skellington
       """
       )
 
-      expect('dummy_app/spec/dummy_app/dummy_app_spec.rb').to contain (
+      expect('dummy_app/spec/dummy_app/dummy_app_spec.rb').to have_content (
       """
       module DummyApp
         describe App do
@@ -39,7 +39,7 @@ module Skellington
       """
       )
 
-      expect('dummy_app/.rspec').to contain (
+      expect('dummy_app/.rspec').to have_content (
       """
       --color
       --require spec_helper

data/spec/matcher/have_content_spec.rb

@@ -0,0 +1,137 @@
+describe 'Matcher' do
+  context 'simple matches' do
+    it 'matches a file and a string' do
+      dump 'A string'
+      expect('matcher').to have_content 'A string'
+    end
+
+    it 'matches two strings ignoring extra whitespace' do
+      dump ' Leading space'
+      expect('matcher').to have_content 'Leading space'
+
+      dump 'Trailing space '
+      expect('matcher').to have_content 'Trailing space'
+
+      dump ' Space at both ends '
+      expect('matcher').to have_content 'Space at both ends'
+    end
+
+    it 'does not match wrong strings' do
+      dump 'A string'
+      expect('matcher').to_not have_content 'A different string'
+    end
+  end
+
+  context 'multi-line matches' do
+    it 'matches on multi-line files' do
+      dump """
+      foo
+      bar
+      baz
+      """
+      expect('matcher').to have_content (
+      """
+      foo
+      bar
+      baz
+      """
+      )
+    end
+
+    it 'matches multi-line, ignoring extraneous whitespace' do
+      dump """
+      odd
+        spacing
+          here
+      """
+      expect('matcher').to have_content (
+      """
+      odd
+      spacing
+      here
+      """
+      )
+    end
+
+    it 'ignores blank lines' do
+      dump """
+
+      this
+      has
+    a blank
+      """
+      expect('matcher').to have_content (
+      """
+      this
+      has
+      a blank
+      """
+      )
+    end
+
+    it 'even blank lines in the middle of the file' do
+      dump """
+      this
+      is
+
+      a
+      file
+      """
+      expect('matcher').to have_content (
+      """
+      this
+      is
+      a
+      file
+      """
+      )
+    end
+  end
+
+  context 'regular expressions' do
+    it 'matches on a regex' do
+      dump 'partial match'
+      expect('matcher').to have_content '/partial/'
+    end
+
+    it 'matches on a regex somewhere in a file' do
+      dump """
+      source 'https://rubygems.org'
+
+      ruby '2.3.0'
+
+      gem 'skellington'
+      """
+      expect('matcher').to have_content (
+      """
+      source 'https://rubygems.org'
+
+      /ruby '[0-9]*\.[0-9]*\.[0-9]*'/
+
+      gem 'skellington'
+      """
+      )
+    end
+
+    it 'fails on a non-match' do
+      dump """
+      foo
+        ruby '2.3.0'
+      bar
+      """
+      expect('matcher').to_not have_content (
+      """
+      foo
+      ruby 2.3.0
+      bar
+      """
+      )
+    end
+  end
+end
+
+def dump content
+  File.open 'matcher', 'w' do |f|
+    f.write content
+  end
+end

data/spec/spec_helper.rb

@@ -16,12 +16,19 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.order = :random
 
+  # Use tmp/ to write skellington
+  $pwd = FileUtils.pwd
   config.before(:each) do
     FileUtils.rm_rf 'tmp'
     FileUtils.mkdir_p 'tmp'
     FileUtils.cd 'tmp'
   end
 
+  config.after(:each) do
+    FileUtils.cd $pwd
+  end
+
+  # Suppress CLI output. This *will* fuck with Pry
   original_stderr = $stderr
   original_stdout = $stdout
   config.before(:all) do
@@ -29,29 +36,11 @@ RSpec.configure do |config|
     $stderr = File.new '/dev/null', 'w'
     $stdout = File.new '/dev/null', 'w'
   end
+
   config.after(:all) do
     $stderr = original_stderr
     $stdout = original_stdout
   end
 end
 
-RSpec::Matchers.define :contain do |expected|
-  match do |actual|
-    x = expected.split("\n").map { |l| l.strip }.reject { |m| m == '' }
-    a = File.readlines(actual).map { |l| l.strip }.reject { |m| m == '' }
-
-    pass = true
-    x.each_with_index do |e, i|
-      if /^\/.*\/$/.match e.strip
-        unless Regexp.new(e.strip[1..-2]).match a[i].strip
-          pass = false
-        end
-      else
-        unless e.strip == a[i].strip
-          pass = false
-        end
-      end
-    end
-    pass
-  end
-end
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}

data/spec/support/matchers/have_content.rb

@@ -0,0 +1,47 @@
+RSpec::Matchers.define :have_content do |expected|
+  match do |actual|
+    actual = File.read actual
+
+    pass = true
+    expected.contentise.each_with_index do |line, index|
+      unless line.matches actual.contentise[index]
+        pass = false
+      end
+    end
+    pass
+  end
+
+  failure_message do |actual|
+    "expected #{expected} to match #{File.read actual}"
+  end
+
+  failure_message_when_negated do |actual|
+    "expected #{expected} to not match #{File.read actual}"
+  end
+
+  description do
+    'matches file content against expectation'
+  end
+end
+
+class String
+  def contentise
+    # split into lines, strip spaces from ends, ding blank lines
+    self.strip.split("\n").map { |l| l.strip }.reject { |l| l == '' }
+  end
+
+  def matches other
+    if self.is_regex
+      return self.to_regex.match other
+    end
+    self == other
+  end
+
+  def is_regex
+    /^\/.*\/$/.match self.strip
+  end
+
+  def to_regex
+    Regexp.new self[1..-2]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skellington
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -147,9 +147,11 @@ files:
 - lib/skellington/helpers.rb
 - lib/skellington/template.rb
 - lib/skellington/version.rb
+- lib/templates/.gitignore.eruby
 - lib/templates/.rspec.eruby
 - lib/templates/.ruby-version.eruby
 - lib/templates/Gemfile.eruby
+- lib/templates/Guardfile.eruby
 - lib/templates/Procfile.eruby
 - lib/templates/Rakefile.eruby
 - lib/templates/config.ru.eruby
@@ -179,6 +181,7 @@ files:
 - spec/cli/cukes_spec.rb
 - spec/cli/gemfile_spec.rb
 - spec/cli/git_spec.rb
+- spec/cli/guardfile_spec.rb
 - spec/cli/javascript_spec.rb
 - spec/cli/non_local_path_spec.rb
 - spec/cli/procfile_spec.rb
@@ -188,8 +191,10 @@ files:
 - spec/cli/spec_spec.rb
 - spec/cli_spec.rb
 - spec/hyphens_spec.rb
+- spec/matcher/have_content_spec.rb
 - spec/skellington_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/have_content.rb
 homepage: http://sam.pikesley.org/projects/skellington/
 licenses:
 - MIT
@@ -221,6 +226,7 @@ test_files:
 - spec/cli/cukes_spec.rb
 - spec/cli/gemfile_spec.rb
 - spec/cli/git_spec.rb
+- spec/cli/guardfile_spec.rb
 - spec/cli/javascript_spec.rb
 - spec/cli/non_local_path_spec.rb
 - spec/cli/procfile_spec.rb
@@ -230,5 +236,7 @@ test_files:
 - spec/cli/spec_spec.rb
 - spec/cli_spec.rb
 - spec/hyphens_spec.rb
+- spec/matcher/have_content_spec.rb
 - spec/skellington_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/have_content.rb