nesta 0.11.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f7a279baf5e3392482afcd20db4e9a0dad93bd96
-  data.tar.gz: 99e8396b1cf4d3895adab3cf9290845bd7142ee8
+SHA256:
+  metadata.gz: e80fef7e8fe518a674eb7527d91410d162fca8288985971e641a3329ae192eef
+  data.tar.gz: bc6f671dc4f0ae10b403fa53b489f06c74ae8e9c6560ae49e08dc2518185dc22
 SHA512:
-  metadata.gz: 66f8714a375bc4cf7e801ca9f8f1f6f24a103736763a4b87e850c58ff983344999543e260b1dbb3add73a8ebae935e08109828fac06a649c4958fb9c3f2c2c8c
-  data.tar.gz: 44ee76299e95a5a329fc8fd6679d8d3be9d7a0eac5c4ef321029c7038b56024ed100a0890937ba045dc46836e96ca1c6d7f3f023b4f0d0444b85a84c69e53b34
+  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/CHANGES

@@ -1,3 +1,45 @@
+= 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)
+
+ * Upgrade from tilt 1.4 to 2.0. (Graham Ashton)
+
+ * Replace the deprecated sass gem with sassc. (Brad Weslake)
+
+ * Port the test suite from RSpec and Webrat to Minitest and Capybara.
+   (Graham Ashton)
+
+ * Silence deprecation warnings produced under Ruby 2.7. (Graham Ashton)
+
+ * Stop running the test suite under Ruby 2.3 and 2.4, both of which
+   have reached end-of-life. (Graham Ashton)
+
 = 0.11.1 / (26 March 2015)
 
  * Tighten dependency on Tilt, as version 2.x is incompatible.
@@ -288,7 +330,7 @@
  * Bug fix: The Sinatra app's root directory wasn't set which meant
    that Nesta couldn't always find the ./public directory (such as when
    running on Heroku).
-   
+
    The modifications made in 0.9.6 to make Nesta easier to mount inside
    another Rack application moved Nesta::App.root to the (new)
    Nesta::Env class. In 0.9.6 I forgot to actually set Nesta::App.root
@@ -360,7 +402,7 @@
 
 = 0.9.3 / 18 January 2011
 
- * The route and view for serving the home page (/) has been removed, 
+ * The route and view for serving the home page (/) has been removed,
    and the home page must now be created as an index page in
    content/pages.
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nesta.gemspec
 gemspec

data/Gemfile.lock

@@ -1,86 +1,104 @@
 PATH
   remote: .
   specs:
-    nesta (0.11.1)
+    nesta (0.13.0)
       RedCloth (~> 4.2)
-      haml (>= 3.1)
+      haml (>= 3.1, < 6.0)
       haml-contrib (>= 1.0)
-      rack (>= 1.3)
+      rack (~> 2.0)
       rdiscount (~> 2.1)
-      sass (>= 3.1)
-      sinatra (~> 1.4)
-      tilt (~> 1.4)
+      sassc (>= 2.2)
+      sinatra (~> 2.0)
+      tilt (~> 2.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    diff-lcs (1.2.5)
-    ffi (1.9.8)
-    haml (4.0.6)
+    RedCloth (4.3.2)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ansi (1.5.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    capybara (2.18.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
+    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)
-    hoe (3.13.1)
-      rake (>= 0.8, < 11.0)
-    kgio (2.9.3)
+    kgio (2.11.4)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mini_portile (0.6.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)
+      ruby-progressbar
     mr-sparkle (0.3.0)
       listen (~> 1.0)
       rb-fsevent (>= 0.9)
       rb-inotify (>= 0.8)
       unicorn (>= 4.5)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.0)
-    rack-protection (1.5.3)
+    mustermann (2.0.2)
+      ruby2_keywords (~> 0.0.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 (0.6.1)
-      rack (>= 1.0)
-    raindrops (0.13.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
+    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.8)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    sass (3.4.13)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    test-unit (1.2.3)
-      hoe (>= 1.5.1)
-    tilt (1.4.1)
-    unicorn (4.8.3)
+    rdiscount (2.2.0.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    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.11)
+    unicorn (6.1.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mr-sparkle (>= 0.0.2)
+  byebug
+  capybara (~> 2.0)
+  minitest (~> 5.0)
+  minitest-reporters
+  mr-sparkle
   nesta!
-  rack-test (= 0.6.1)
-  rspec (~> 2.14.0)
-  test-unit (= 1.2.3)
-  webrat (~> 0.7.3)
+  rake
+
+BUNDLED WITH
+   2.3.14

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 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,20 +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. Update the versions of Ruby used in `.travis.yml` and
-   `smoke-test.sh`. If not, commit and push. Verify that all relevant
-   versions of Ruby have been installed locally, with `chruby`.
+4. Commit these changes with a commit message of 'Bump version to <version>'
 
-4. Run `smoke-test.sh`.
+5. Generate a new site with the `nesta` command, install the demo content,
+   check that it runs okay locally.
 
-5. Once you're confident the freshly generated sites work okay in the
-   previous step, 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

@@ -5,7 +5,24 @@ Bundler.require(:default, :test)
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+namespace :test do
+  task :set_load_path do
+    $LOAD_PATH.unshift File.expand_path('test')
+  end
 
-task :default => :spec
+  def load_tests(directory)
+    Rake::FileList["test/#{directory}/*_test.rb"].each { |f| require_relative f }
+  end
+
+  task units: :set_load_path do
+    load_tests('unit/**')
+  end
+
+  task integrations: :set_load_path do
+    load_tests('integration/**')
+  end
+end
+
+task test: 'test:set_load_path' do
+  load_tests('**')
+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/app.rb

@@ -1,6 +1,6 @@
 require 'sinatra/base'
 require 'haml'
-require 'sass'
+require 'sassc'
 
 require File.expand_path('../nesta', File.dirname(__FILE__))
 require File.expand_path('env', File.dirname(__FILE__))
@@ -55,13 +55,9 @@ module Nesta
       stylesheet(params[:sheet].to_sym)
     end
 
-    get %r{/attachments/([\w/.@-]+)} do |file|
-      file = File.join(Nesta::Config.attachment_path, params[:captures].first)
-      if file =~ /\.\.\//
-        not_found
-      else
-        send_file(file, disposition: nil)
-      end
+    get '/attachments/*' do |path|
+      filename = File.join(Nesta::Config.attachment_path, path)
+      send_file(filename, disposition: nil)
     end
 
     get '/articles.xml' do

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

@@ -1,36 +1,52 @@
-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 = 'https://github.com/gma/nesta-demo-content.git'
+        class << self
+          attr_accessor :demo_repository
+        end
 
         def initialize(*args)
           @dir = 'content-demo'
         end
 
-        def clone_or_update_repository
-          repository = 'git://github.com/gma/nesta-demo-content.git'
+        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', repository, path)
+            process.run('git', 'clone', self.class.demo_repository, path)
           end
         end
 
+        def exclude_path
+          Nesta::Path.local('.git/info/exclude')
+        end
+
+        def in_git_repo?
+          File.directory?(Nesta::Path.local('.git'))
+        end
+
+        def demo_repo_ignored?
+          File.read(exclude_path).split.any? { |line| line == @dir }
+        rescue Errno::ENOENT
+          false
+        end
+
         def configure_git_to_ignore_repo
-          excludes = Nesta::Path.local('.git/info/exclude')
-          if File.exist?(excludes) && File.read(excludes).scan(@dir).empty?
-            File.open(excludes, 'a') { |file| file.puts @dir }
+          if in_git_repo? && ! demo_repo_ignored?
+            FileUtils.mkdir_p(File.dirname(exclude_path))
+            File.open(exclude_path, 'a') { |file| file.puts @dir }
           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