nesta 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a79722f3a6494862b4365151dd2300b0eccece20b6cb711298c753763926d9ea
-  data.tar.gz: 4eca7c5b41e3103500237791960658ca8a3b0d1bf50e83860d74d531dd40fb17
+  metadata.gz: e80fef7e8fe518a674eb7527d91410d162fca8288985971e641a3329ae192eef
+  data.tar.gz: bc6f671dc4f0ae10b403fa53b489f06c74ae8e9c6560ae49e08dc2518185dc22
 SHA512:
-  metadata.gz: 36a89f709fa69d85e340a93ef44ca6fa43a31f54585d0da3c7ca359ed40dddd1003374a75feb0350bd53403595df0f71e513255a16e13dce0568c434fca62d9e
-  data.tar.gz: b3c443a50646d62b70247743c6157433a946d98566b72631284217458e218908720c2ce3bf01534630458cb35cd4c3045d187861385ad3ada43256f74e55f054
+  metadata.gz: 857872073a0ea318df15323bd0f9a64de0104106b45c0c749a2261e266866abc0dd38f475fa98de07fb9cb09ee41411b837ec91a1e7d581bb1924f697557184d
+  data.tar.gz: 828a24e35350cfae15ff093f42a67a6ee33faf48435b0e0d9ff831e3e5a1592b2e22db2910442eb39adc7642f5b3f451224dcf8f49fcc11d7a062e7a48f4b47c

data/.github/workflows/tests.yml

@@ -0,0 +1,21 @@
+---
+name: run-tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", "head"]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test
+        env:
+          REPORTER: default

data/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "test/fixtures/demo-content.git"]
-	path = test/fixtures/demo-content.git
-	url = https://github.com/gma/nesta-demo-content.git
-[submodule "test/fixtures/nesta-theme-test"]
-	path = test/fixtures/nesta-theme-test.git
-	url = https://github.com/gma/nesta-theme-test.git

data/CHANGES

@@ -1,3 +1,29 @@
+= 0.13.0 / (28 September 2022)
+
+ * Update dependencies in order to support Ruby 3.0 and above.
+   (Graham Ashton)
+
+ * Upgrade multiple dependencies to fix security vulnerabilities.
+   (Graham Ashton)
+
+ * Switch Git repository URLs to HTTPS (fixes the demo:content command).
+   (Graham Ashton)
+
+ * Update dependency on Haml; Nesta currently requires a version lower
+   than 6.0. (Graham Ashton)
+
+ * Refactor: Extracted logic for running external processes into
+   a new `Nesta::SystemCommand` class. (Graham Ashton)
+
+ * Refactor: Created a new `Nesta::Commands::Template` class for
+   commands that create files from templates. (Graham Ashton)
+
+ * Refactor: Move logic for editing the config file from within Nesta's
+   commands into new `Nesta::ConfigFile` class. (Graham Ashton)
+
+ * Stopped the test suite from executing external commands during tests.
+   (Graham Ashton)
+
 = 0.12.0 / (30 June 2020)
 
  * Upgrade to Sinatra 2 and Rack 2. (Graham Ashton)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    nesta (0.12.0)
+    nesta (0.13.0)
       RedCloth (~> 4.2)
-      haml (>= 3.1)
+      haml (>= 3.1, < 6.0)
       haml-contrib (>= 1.0)
       rack (~> 2.0)
       rdiscount (~> 2.1)
@@ -15,8 +15,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -27,21 +27,21 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    ffi (1.13.1)
-    haml (5.1.2)
+    ffi (1.15.5)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     haml-contrib (1.0.0.1)
       haml (>= 3.2.0.alpha.13)
-    kgio (2.11.3)
+    kgio (2.11.4)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    minitest-reporters (1.4.2)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
+    minitest-reporters (1.5.0)
       ansi
       builder
       minitest (>= 5.0)
@@ -51,36 +51,38 @@ GEM
       rb-fsevent (>= 0.9)
       rb-inotify (>= 0.8)
       unicorn (>= 4.5)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.5)
-    rack (2.2.3)
-    rack-protection (2.0.8.1)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    public_suffix (5.0.0)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-protection (2.2.2)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    raindrops (0.19.1)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    raindrops (0.20.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.5)
+    rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
-    rdiscount (2.2.0.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
+    rdiscount (2.2.0.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.2)
       tilt (~> 2.0)
     temple (0.8.2)
-    tilt (2.0.10)
-    unicorn (5.5.5)
+    tilt (2.0.11)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     xpath (3.2.0)
@@ -99,4 +101,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.1.4
+   2.3.14

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2020 Graham Ashton
+Copyright (c) 2008-2022 Graham Ashton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
 # Nesta - a CMS for Ruby Developers
 
-A CMS for small web sites and blogs, written in [Sinatra][frank].
+A file-based CMS for web sites and blogs, written in [Sinatra][frank].
 
 Content can be written in [Markdown][markdown] or [Textile][textile] and
 stored in text files (though you can also use Haml if you need to add
@@ -44,9 +44,8 @@ full instructions).
 ## Support
 
 There's plenty of information on <http://nestacms.com>. If you need some
-help with anything just jump on the [mailing list][] and ask.
-
-[mailing list]: http://nestacms.com/support
+help with anything feel free to file an issue, or contact me (@grahamashton)
+on Twitter.
 
 If you like Nesta you can keep up with developments by following [@nestacms][]
 on Twitter, and on [the blog][].
@@ -56,19 +55,13 @@ on Twitter, and on [the blog][].
 
 ## Contributing
 
-If you want to add a new feature, I recommend that you post a quick
-message to the [mailing list][] before you start coding. I'm likely to
-suggest that we implement it as a [plugin][] (to keep Nesta itself lean
-and simple), so you might save yourself some time if we chat about a
-good approach before you start.
+If you want to add a new feature, I recommend that you file an issue to discuss
+it before you start coding. I'm likely to suggest that we implement it as a
+[plugin][] (to keep Nesta itself lean and simple), so you might save yourself
+some time if we chat about a good approach before you start.
 
 [plugin]: http://nestacms.com/docs/plugins
 
-If you think you've found a bug, please bring that up on the [mailing
-list][] too, rather than creating an issue on GitHub straight away.
-You'll probably get a faster response on the mailing list, as I'm the
-only person who'll see your new issue.
-
 -- Graham ([@grahamashton][] on Twitter).
 
 [@grahamashton]: http://twitter.com/grahamashton

data/RELEASING.md

@@ -3,19 +3,21 @@
 When it comes time to release a new version of the Nesta gem, these are
 the steps:
 
-1. Bump the version number in `lib/nesta/version.rb`. This will cause
+1. Check the versions of Ruby used in `.github/workflows` are up to date. If
+   new Ruby versions need testing, update the config and re-run the build.
+
+2. Bump the version number in `lib/nesta/version.rb`. This will cause
    the version number in `Gemfile.lock` to be updated too, so regenerate
    it now and check them in together.
 
-2. Update the `CHANGES` file with a summary of significant changes since
+3. Update the `CHANGES` file with a summary of significant changes since
    the previous release.
 
-3. Check the versions of Ruby used in `.travis.yml` are up to date. If new
-   Ruby versions need testing, update the config and re-run the Travis build.
+4. Commit these changes with a commit message of 'Bump version to <version>'
 
-4. Generate a new site with the `nesta` command, install the demo content,
+5. Generate a new site with the `nesta` command, install the demo content,
    check that it runs okay locally.
 
-5. If everything seems fine, run `rake release`.
+6. If everything seems fine, run `rake release`.
 
-6. Publish an announcement blog post and email the list.
+7. Publish an announcement blog post and email the list.

data/Rakefile

@@ -15,11 +15,11 @@ namespace :test do
   end
 
   task units: :set_load_path do
-    load_tests('unit')
+    load_tests('unit/**')
   end
 
   task integrations: :set_load_path do
-    load_tests('integration')
+    load_tests('integration/**')
   end
 end
 

data/bin/nesta

@@ -91,7 +91,7 @@ EOF
       rescue NameError
         usage
       else
-        command_cls.new(ARGV[0], options).execute
+        command_cls.new(ARGV[0], options).execute(Nesta::SystemCommand.new)
       end
     rescue RuntimeError => e
       $stderr.puts "ERROR: #{e}"

data/config/deploy.rb.sample

@@ -1,5 +1,5 @@
 set :application, "nesta"
-set :repository, "git://github.com/gma/nesta.git"
+set :repository, "https://github.com/gma/nesta.git"
 
 # Set :user if you want to connect (via ssh) to your server using a
 # different username. You will also need to include the user in :domain

data/lib/nesta/commands/demo/content.rb

@@ -1,12 +1,10 @@
-require File.expand_path('../command', File.dirname(__FILE__))
+require File.expand_path('../../config_file', File.dirname(__FILE__))
 
 module Nesta
   module Commands
     module Demo
       class Content
-        include Command
-
-        @demo_repository = 'git://github.com/gma/nesta-demo-content.git'
+        @demo_repository = 'https://github.com/gma/nesta-demo-content.git'
         class << self
           attr_accessor :demo_repository
         end
@@ -15,12 +13,12 @@ module Nesta
           @dir = 'content-demo'
         end
 
-        def clone_or_update_repository
+        def clone_or_update_repository(process)
           path = Nesta::Path.local(@dir)
           if File.exist?(path)
-            FileUtils.cd(path) { run_process('git', 'pull', 'origin', 'master') }
+            FileUtils.cd(path) { process.run('git', 'pull', 'origin', 'master') }
           else
-            run_process('git', 'clone', self.class.demo_repository, path)
+            process.run('git', 'clone', self.class.demo_repository, path)
           end
         end
 
@@ -45,10 +43,10 @@ module Nesta
           end
         end
 
-        def execute
-          clone_or_update_repository
+        def execute(process)
+          clone_or_update_repository(process)
           configure_git_to_ignore_repo
-          update_config_yaml(/^\s*#?\s*content:.*/, "content: #{@dir}")
+          Nesta::ConfigFile.new.set_value('content', @dir)
         end
       end
     end

data/lib/nesta/commands/edit.rb

@@ -1,20 +1,16 @@
-require File.expand_path('command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     class Edit
-      include Command
-
       def initialize(*args)
         @filename = Nesta::Config.page_path(args.shift)
       end
 
-      def execute
+      def execute(process)
         editor = ENV.fetch('EDITOR')
       rescue IndexError
         $stderr.puts "No editor: set EDITOR environment variable"
       else
-        run_process(editor, @filename)
+        process.run(editor, @filename)
       end
     end
   end

data/lib/nesta/commands/new.rb

@@ -1,10 +1,6 @@
-require File.expand_path('command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     class New
-      include Command
-
       def initialize(*args)
         path = args.shift
         options = args.shift || {}
@@ -26,18 +22,18 @@ module Nesta
         @options['vlad']
       end
 
-      def create_repository
+      def create_repository(process)
         FileUtils.cd(@path) do
           File.open('.gitignore', 'w') do |file|
             file.puts %w[._* .*.swp .bundle .DS_Store .sass-cache].join("\n")
           end
-          run_process('git', 'init')
-          run_process('git', 'add', '.')
-          run_process('git', 'commit', '-m', 'Initial commit')
+          process.run('git', 'init')
+          process.run('git', 'add', '.')
+          process.run('git', 'commit', '-m', 'Initial commit')
         end
       end
 
-      def execute
+      def execute(process)
         make_directories
         templates = {
           'config.ru' => "#{@path}/config.ru",
@@ -49,8 +45,10 @@ module Nesta
         if @options['vlad']
           templates['config/deploy.rb'] = "#{@path}/config/deploy.rb"
         end
-        copy_templates(templates)
-        create_repository if @options['git']
+        templates.each do |src, dest|
+          Nesta::Commands::Template.new(src).copy_to(dest, binding)
+        end
+        create_repository(process) if @options['git']
       end
     end
   end

data/lib/nesta/commands/plugin/create.rb

@@ -1,11 +1,7 @@
-require File.expand_path('../command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     module Plugin
       class Create
-        include Command
-
         def initialize(*args)
           name = args.shift
           name.nil? && (raise UsageError.new('name not specified'))
@@ -54,9 +50,9 @@ module Nesta
           File.join(@gem_name, path)
         end
 
-        def execute
+        def execute(process)
           make_directories
-          copy_templates(
+          {
             'plugins/README.md' => gem_path('README.md'),
             'plugins/gitignore' => gem_path('.gitignore'),
             'plugins/plugin.gemspec' => gem_path("#{@gem_name}.gemspec"),
@@ -65,10 +61,12 @@ module Nesta
             'plugins/lib/version.rb' => gem_path("lib/#{@gem_name}/version.rb"),
             'plugins/lib/init.rb' => gem_path("lib/#{@gem_name}/init.rb"),
             'plugins/Rakefile' => gem_path('Rakefile')
-          )
+          }.each do |src, dest|
+            Nesta::Commands::Template.new(src).copy_to(dest, binding)
+          end
           Dir.chdir(@gem_name) do
-            run_process('git', 'init')
-            run_process('git', 'add', '.')
+            process.run('git', 'init')
+            process.run('git', 'add', '.')
           end
         end
 

data/lib/nesta/commands/template.rb

@@ -0,0 +1,20 @@
+module Nesta
+  module Commands
+    class Template
+      def initialize(filename)
+        @filename = filename
+      end
+
+      def template_path
+        dir = File.expand_path('../../../templates', File.dirname(__FILE__))
+        File.join(dir, @filename)
+      end
+
+      def copy_to(dest, context)
+        FileUtils.mkdir_p(File.dirname(dest))
+        template = ERB.new(File.read(template_path), trim_mode: "-")
+        File.open(dest, 'w') { |file| file.puts template.result(context) }
+      end
+    end
+  end
+end

data/lib/nesta/commands/theme/create.rb

@@ -1,18 +1,16 @@
-require File.expand_path('../command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     module Theme
       class Create
-        include Command
-
         def initialize(*args)
           name = args.shift
           options = args.shift || {}
           name.nil? && (raise UsageError.new('name not specified'))
           @name = name
           @theme_path = Nesta::Path.themes(@name)
-          fail("#{@theme_path} already exists") if File.exist?(@theme_path)
+          if File.exist?(@theme_path)
+            Nesta.fail_with("#{@theme_path} already exists")
+          end
         end
 
         def make_directories
@@ -20,15 +18,17 @@ module Nesta
           FileUtils.mkdir_p(File.join(@theme_path, 'views'))
         end
 
-        def execute
+        def execute(process)
           make_directories
-          copy_templates(
+          {
             'themes/README.md' => "#{@theme_path}/README.md",
             'themes/app.rb' => "#{@theme_path}/app.rb",
             'themes/views/layout.haml' => "#{@theme_path}/views/layout.haml",
             'themes/views/page.haml' => "#{@theme_path}/views/page.haml",
             'themes/views/master.sass' => "#{@theme_path}/views/master.sass"
-          )
+          }.each do |src, dest|
+            Nesta::Commands::Template.new(src).copy_to(dest, binding)
+          end
         end
       end
     end

data/lib/nesta/commands/theme/enable.rb

@@ -1,11 +1,9 @@
-require File.expand_path('../command', File.dirname(__FILE__))
+require File.expand_path('../../config_file', File.dirname(__FILE__))
 
 module Nesta
   module Commands
     module Theme
       class Enable
-        include Command
-
         def initialize(*args)
           name = args.shift
           options = args.shift || {}
@@ -13,8 +11,8 @@ module Nesta
           @name = name
         end
 
-        def execute
-          update_config_yaml(/^\s*#?\s*theme:.*/, "theme: #{@name}")
+        def execute(process)
+          Nesta::ConfigFile.new.set_value('theme', @name)
         end
       end
     end

data/lib/nesta/commands/theme/install.rb

@@ -1,11 +1,7 @@
-require File.expand_path('../command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     module Theme
       class Install
-        include Command
-
         def initialize(*args)
           @url = args.shift
           @url.nil? && (raise UsageError.new('URL not specified'))
@@ -16,14 +12,14 @@ module Nesta
           File.basename(@url, '.git').sub(/nesta-theme-/, '')
         end
 
-        def execute
-          run_process('git', 'clone', @url, "themes/#{theme_name}")
-          FileUtils.rm_r(File.join("themes/#{theme_name}", '.git'))
-          enable
+        def execute(process)
+          process.run('git', 'clone', @url, "themes/#{theme_name}")
+          FileUtils.rm_rf(File.join("themes/#{theme_name}", '.git'))
+          enable(process)
         end
 
-        def enable
-          Enable.new(theme_name).execute
+        def enable(process)
+          Enable.new(theme_name).execute(process)
         end
       end
     end

data/lib/nesta/commands.rb

@@ -4,10 +4,18 @@ require 'fileutils'
 require File.expand_path('env', File.dirname(__FILE__))
 require File.expand_path('app', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
+require File.expand_path('system_command', File.dirname(__FILE__))
 require File.expand_path('version', File.dirname(__FILE__))
 
 require File.expand_path('commands/demo', File.dirname(__FILE__))
 require File.expand_path('commands/edit', File.dirname(__FILE__))
 require File.expand_path('commands/new', File.dirname(__FILE__))
 require File.expand_path('commands/plugin', File.dirname(__FILE__))
+require File.expand_path('commands/template', File.dirname(__FILE__))
 require File.expand_path('commands/theme', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    class UsageError < RuntimeError; end
+  end
+end

data/lib/nesta/config_file.rb

@@ -0,0 +1,25 @@
+module Nesta
+  class ConfigFile
+    def set_value(key, value)
+      pattern = /^\s*#?\s*#{key}:.*/
+      replacement = "#{key}: #{value}"
+
+      configured = false
+      File.open(Nesta::Config.yaml_path, 'r+') do |file|
+        output = ''
+        file.each_line do |line|
+          if configured
+            output << line
+          else
+            output << line.sub(pattern, replacement)
+            configured = true if line =~ pattern
+          end
+        end
+        output << "#{replacement}\n" unless configured
+        file.pos = 0
+        file.print(output)
+        file.truncate(file.pos)
+      end
+    end
+  end
+end

data/lib/nesta/system_command.rb

@@ -0,0 +1,15 @@
+module Nesta
+  class SystemCommand
+    def run(*args)
+      system(*args)
+      if ! $?.success?
+        message = if $?.exitstatus == 127
+                    "#{args[0]} not found"
+                  else
+                    "'#{args.join(' ')}' failed with status #{$?.exitstatus}"
+                  end
+        Nesta.fail_with(message)
+      end
+    end
+  end
+end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/lib/nesta.rb

@@ -4,6 +4,11 @@ module Nesta
       $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
     end
   end
+
+  def self.fail_with(message)
+    $stderr.puts "Error: #{message}"
+    exit 1
+  end
 end
 
-require 'nesta/plugin'
+require File.expand_path('nesta/plugin', File.dirname(__FILE__))

data/nesta.gemspec

@@ -29,7 +29,7 @@ EOF
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('haml', '>= 3.1')
+  s.add_dependency('haml', '>= 3.1', '< 6.0')
   s.add_dependency('haml-contrib', '>= 1.0')
   s.add_dependency('rack', '~> 2.0')
   s.add_dependency('rdiscount', '~> 2.1')

data/test/integration/commands/demo/content_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
-require_relative '../../../support/silence_commands_during_tests'
 require_relative '../../../../lib/nesta/commands'
 
-Nesta::Commands::Demo::Content.send(:include, SilenceCommandsDuringTests)
-
 describe 'nesta demo:content' do
   include TemporaryFiles
 
@@ -11,10 +8,15 @@ describe 'nesta demo:content' do
     Nesta::Commands::Demo::Content.demo_repository = '../../fixtures/demo-content.git'
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'clones the demo repository and configures project to use it' do
     in_temporary_project do
-      Nesta::Commands::Demo::Content.new.execute
-      assert_exists_in_project 'content-demo/pages/index.haml'
+      Nesta::Commands::Demo::Content.new.execute(process_stub)
 
       yaml = File.read(File.join(project_root, 'config', 'config.yml'))
       assert_match /content: content-demo/, yaml
@@ -24,7 +26,7 @@ describe 'nesta demo:content' do
   it 'ensures demo repository is ignored by git' do
     in_temporary_project do
       FileUtils.mkdir('.git')
-      Nesta::Commands::Demo::Content.new.execute
+      Nesta::Commands::Demo::Content.new.execute(process_stub)
       assert_match /content-demo/, File.read(project_path('.git/info/exclude'))
     end
   end

data/test/integration/commands/edit_test.rb

@@ -9,13 +9,13 @@ describe 'nesta edit' do
   end
 
   it 'launches the editor' do
-    ENV['EDITOR'] = 'touch'
+    ENV['EDITOR'] = 'vi'
     edited_file = 'path/to/page.md'
+    process = Minitest::Mock.new
+    process.expect(:run, true, [ENV['EDITOR'], /#{edited_file}$/])
     with_temp_content_directory do
-      FileUtils.mkdir_p(Nesta::Config.page_path(File.dirname(edited_file)))
       command = Nesta::Commands::Edit.new(edited_file)
-      command.execute
-      assert File.exist?(Nesta::Config.page_path(edited_file)), 'editor not run'
+      command.execute(process)
     end
   end
 end

data/test/integration/commands/new_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
-require_relative '../../support/silence_commands_during_tests'
 require_relative '../../../lib/nesta/commands'
 
-Nesta::Commands::New.send(:include, SilenceCommandsDuringTests)
-
 describe 'nesta new' do
   include TemporaryFiles
 
@@ -19,30 +16,36 @@ describe 'nesta new' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   describe 'without options' do
     it 'creates the content directories' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'content/attachments'
       assert_exists_in_project 'content/pages'
     end
 
     it 'creates the home page' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'content/pages/index.haml'
     end
 
     it 'creates the rackup file' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'config.ru'
     end
 
     it 'creates the config.yml file' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'config/config.yml'
     end
 
     it 'creates a Gemfile' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'Gemfile'
       assert_match /gem 'nesta'/, gemfile_source
     end
@@ -51,67 +54,35 @@ describe 'nesta new' do
   describe 'with --git option' do
     it 'creates a .gitignore file' do
       command = Nesta::Commands::New.new(project_root, 'git' => '')
-      command.stub(:run_process, nil) do
-        command.execute
-        assert_match /\.bundle/, File.read(project_path('.gitignore'))
-      end
-    end
-
-    def disabling_git_hooks
-      # I (@gma) have got a git repository template setup on my computer
-      # containing git hooks that automatically run ctags in a
-      # background process whenever I run `git commit`. The hooks are
-      # copied into new repositories when I run `git init`.
-      #
-      # The generation of the ctags file (in a forked process) causes a
-      # race condition; sometimes ctags will recreate a test's project
-      # folder and git directory after the test's `after` block has
-      # deleted it. If the project directory isn't removed after each
-      # test, the New command will throw an error in the subsequent
-      # test (complaining that the project directory already exists).
-      #
-      templates = temp_path('git_template')
-      FileUtils.mkdir_p(templates)
-      ENV['GIT_TEMPLATE_DIR'] = templates
-      yield
-      ENV.delete('GIT_TEMPLATE_DIR')
-      FileUtils.rm_r(templates)
+      command.execute(process_stub)
+      assert_match /\.bundle/, File.read(project_path('.gitignore'))
     end
 
     it 'creates a git repo' do
-      disabling_git_hooks do
-        command = Nesta::Commands::New.new(project_root, 'git' => '')
-        command.execute
-        assert_exists_in_project '.git/config'
-      end
-    end
-
-    it 'commits the blank project' do
-      disabling_git_hooks do
-        command = Nesta::Commands::New.new(project_root, 'git' => '')
-        command.execute
-        Dir.chdir(project_root) do
-          assert_match /Initial commit/, `git log --pretty=oneline | head -n 1`
-        end
-      end
+      command = Nesta::Commands::New.new(project_root, 'git' => '')
+      process = Minitest::Mock.new
+      process.expect(:run, true, ['git', 'init'])
+      process.expect(:run, true, ['git', 'add', '.'])
+      process.expect(:run, true, ['git', 'commit', '-m', 'Initial commit'])
+      command.execute(process)
     end
   end
 
   describe 'with --vlad option' do
     it 'adds vlad to Gemfile' do
-      Nesta::Commands::New.new(project_root, 'vlad' => '').execute
+      Nesta::Commands::New.new(project_root, 'vlad' => '').execute(process_stub)
       assert_match /gem 'vlad', '2.1.0'/, gemfile_source
       assert_match /gem 'vlad-git', '2.2.0'/, gemfile_source
     end
 
     it 'configures the vlad rake tasks' do
-      Nesta::Commands::New.new(project_root, 'vlad' => '').execute
+      Nesta::Commands::New.new(project_root, 'vlad' => '').execute(process_stub)
       assert_exists_in_project 'Rakefile'
       assert_match /require 'vlad'/, rakefile_source
     end
 
     it 'creates deploy.rb' do
-      Nesta::Commands::New.new(project_root, 'vlad' => '').execute
+      Nesta::Commands::New.new(project_root, 'vlad' => '').execute(process_stub)
       assert_exists_in_project 'config/deploy.rb'
       deploy_source = File.read(project_path('config/deploy.rb'))
       assert_match /set :application, 'mysite.com'/, deploy_source

data/test/integration/commands/plugin/create_test.rb

@@ -24,13 +24,16 @@ describe 'nesta plugin:create' do
     "nesta-plugin-#{plugin_name}"
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   def create_plugin(&block)
     Dir.chdir(working_directory) do
       command = Nesta::Commands::Plugin::Create.new(plugin_name)
-      command.stub(:run_process, nil) do
-        command.execute
-        yield
-      end
+      command.execute(process_stub)
     end
   end
 

data/test/integration/commands/theme/create_test.rb

@@ -16,9 +16,15 @@ describe 'nesta theme:create' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'creates default files in the theme directory' do
     Dir.chdir(project_root) do
-      Nesta::Commands::Theme::Create.new('theme-name').execute
+      Nesta::Commands::Theme::Create.new('theme-name').execute(process_stub)
     end
     assert_exists_in_project theme_path('README.md')
     assert_exists_in_project theme_path('app.rb')
@@ -26,7 +32,7 @@ describe 'nesta theme:create' do
 
   it 'copies default view templates into views directory' do
     Dir.chdir(project_root) do
-      Nesta::Commands::Theme::Create.new('theme-name').execute
+      Nesta::Commands::Theme::Create.new('theme-name').execute(process_stub)
     end
     %w(layout.haml page.haml master.sass).each do |template|
       assert_exists_in_project theme_path("views/#{template}")

data/test/integration/commands/theme/enable_test.rb

@@ -13,9 +13,15 @@ describe 'nesta theme:enable' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'enables the theme' do
     Dir.chdir(project_root) do
-      Nesta::Commands::Theme::Enable.new('theme-name').execute
+      Nesta::Commands::Theme::Enable.new('theme-name').execute(process_stub)
       assert_match /^theme: theme-name/, File.read('config/config.yml')
     end
   end

data/test/integration/commands/theme/install_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
-require_relative '../../../support/silence_commands_during_tests'
 require_relative '../../../../lib/nesta/commands'
 
-Nesta::Commands::Theme::Install.send(:include, SilenceCommandsDuringTests)
-
 describe 'nesta theme:install' do
   include TemporaryFiles
 
@@ -27,35 +24,42 @@ describe 'nesta theme:install' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'clones the repository' do
+    process = Minitest::Mock.new
+    process.expect(:run, true, ['git', 'clone', repo_url, "themes/#{theme_name}"])
     in_temporary_project do
-      Nesta::Commands::Theme::Install.new(repo_url).execute
-      assert File.directory?(theme_dir), 'theme not cloned'
+      Nesta::Commands::Theme::Install.new(repo_url).execute(process)
     end
   end
 
   it "removes the theme's .git directory" do
     in_temporary_project do
-      Nesta::Commands::Theme::Install.new(repo_url).execute
+      Nesta::Commands::Theme::Install.new(repo_url).execute(process_stub)
       refute File.exist?("#{theme_dir}/.git"), '.git folder found'
     end
   end
 
   it 'enables the freshly installed theme' do
     in_temporary_project do
-      Nesta::Commands::Theme::Install.new(repo_url).execute
+      Nesta::Commands::Theme::Install.new(repo_url).execute(process_stub)
       assert_match /theme: #{theme_name}/, File.read('config/config.yml')
     end
   end
 
   it 'determines name of theme from name of repository' do
-    url = 'git://foobar.com/path/to/nesta-theme-the-name.git'
+    url = 'https://foobar.com/path/to/nesta-theme-the-name.git'
     command = Nesta::Commands::Theme::Install.new(url)
     assert_equal 'the-name', command.theme_name
   end
 
   it "falls back to name of repo when theme name doesn't match correct format" do
-    url = 'git://foobar.com/path/to/mytheme.git'
+    url = 'https://foobar.com/path/to/mytheme.git'
     command = Nesta::Commands::Theme::Install.new(url)
     assert_equal 'mytheme', command.theme_name
   end

data/test/unit/system_command_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+require_relative '../../lib/nesta/system_command'
+
+describe 'Nesta::SystemCommand' do
+  describe '#run' do
+    it 'catches errors when running external processes' do
+      command = Nesta::SystemCommand.new
+      command.run('ls / >/dev/null')
+      begin
+        stderr, $stderr = $stderr, StringIO.new
+        assert_raises(SystemExit) do
+          command.run('ls no-such-file 2>/dev/null')
+        end
+      ensure
+        $stderr.close
+        $stderr = stderr
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: haml-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -225,11 +231,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".hound.yml"
-- ".rspec"
-- ".travis.yml"
 - CHANGES
 - Gemfile
 - Gemfile.lock
@@ -244,18 +248,19 @@ files:
 - lib/nesta.rb
 - lib/nesta/app.rb
 - lib/nesta/commands.rb
-- lib/nesta/commands/command.rb
 - lib/nesta/commands/demo.rb
 - lib/nesta/commands/demo/content.rb
 - lib/nesta/commands/edit.rb
 - lib/nesta/commands/new.rb
 - lib/nesta/commands/plugin.rb
 - lib/nesta/commands/plugin/create.rb
+- lib/nesta/commands/template.rb
 - lib/nesta/commands/theme.rb
 - lib/nesta/commands/theme/create.rb
 - lib/nesta/commands/theme/enable.rb
 - lib/nesta/commands/theme/install.rb
 - lib/nesta/config.rb
+- lib/nesta/config_file.rb
 - lib/nesta/env.rb
 - lib/nesta/helpers.rb
 - lib/nesta/models.rb
@@ -263,6 +268,7 @@ files:
 - lib/nesta/overrides.rb
 - lib/nesta/path.rb
 - lib/nesta/plugin.rb
+- lib/nesta/system_command.rb
 - lib/nesta/version.rb
 - nesta.gemspec
 - scripts/import-from-mephisto
@@ -305,17 +311,16 @@ files:
 - test/integration/sitemap_test.rb
 - test/integration_test_helper.rb
 - test/support/model_factory.rb
-- test/support/silence_commands_during_tests.rb
 - test/support/temporary_files.rb
 - test/support/test_configuration.rb
 - test/test_helper.rb
-- test/unit/commands_test.rb
 - test/unit/config_test.rb
 - test/unit/file_model_test.rb
 - test/unit/menu_test.rb
 - test/unit/page_test.rb
 - test/unit/path_test.rb
 - test/unit/plugin_test.rb
+- test/unit/system_command_test.rb
 - views/analytics.haml
 - views/atom.haml
 - views/categories.haml
@@ -353,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Ruby CMS, written in Sinatra

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  enabled: true

data/.rspec

@@ -1 +0,0 @@
---color

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_script:
-  - git config --global user.email "continuous-integration@nestacms.com"
-  - git config --global user.name "Nesta CI"
-script: bundle exec rake test
-env:
-  - REPORTER=default

data/lib/nesta/commands/command.rb

@@ -1,57 +0,0 @@
-module Nesta
-  module Commands
-    class UsageError < RuntimeError; end
-
-    module Command
-      def run_process(*args)
-        system(*args)
-        if ! $?.success?
-          message = if $?.exitstatus == 127
-                      "#{args[0]} not found"
-                    else
-                      "'#{args.join(' ')}' failed with status #{$?.exitstatus}"
-                    end
-          fail(message)
-        end
-      end
-
-      def fail(message)
-        $stderr.puts "Error: #{message}"
-        exit 1
-      end
-
-      def template_root
-        File.expand_path('../../../templates', File.dirname(__FILE__))
-      end
-
-      def copy_template(src, dest)
-        FileUtils.mkdir_p(File.dirname(dest))
-        template = ERB.new(File.read(File.join(template_root, src)), nil, "-")
-        File.open(dest, 'w') { |file| file.puts template.result(binding) }
-      end
-
-      def copy_templates(templates)
-        templates.each { |src, dest| copy_template(src, dest) }
-      end
-
-      def update_config_yaml(pattern, replacement)
-        configured = false
-        File.open(Nesta::Config.yaml_path, 'r+') do |file|
-          output = ''
-          file.each_line do |line|
-            if configured
-              output << line
-            else
-              output << line.sub(pattern, replacement)
-              configured = true if line =~ pattern
-            end
-          end
-          output << "#{replacement}\n" unless configured
-          file.pos = 0
-          file.print(output)
-          file.truncate(file.pos)
-        end
-      end
-    end
-  end
-end

data/test/support/silence_commands_during_tests.rb

@@ -1,5 +0,0 @@
-module SilenceCommandsDuringTests
-  def run_process(*args)
-    super(*args, out: '/dev/null', err: '/dev/null')
-  end
-end

data/test/unit/commands_test.rb

@@ -1,23 +0,0 @@
-require 'test_helper'
-require_relative '../../lib/nesta/commands'
-
-class TestCommand
-  include Nesta::Commands::Command
-end
-
-describe 'Nesta::Commands::Command' do
-  describe '#run_process' do
-    it 'catches errors when running external processes' do
-      TestCommand.new.run_process('ls / >/dev/null')
-      begin
-        stderr, $stderr = $stderr, File.open('/dev/null', 'w')
-        assert_raises(SystemExit) do
-          TestCommand.new.run_process('ls no-such-file 2>/dev/null')
-        end
-      ensure
-        $stderr.close
-        $stderr = stderr
-      end
-    end
-  end
-end