nesta 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904b608182032947bdcad754a909a9b49e1f4be7
-  data.tar.gz: 3759e6ccd241eac679f762209f4987746511596c
+  metadata.gz: 56113bb66385f92b2b5bc75d696a9f5f3bd98ddb
+  data.tar.gz: 2894ebcfceecfcb70c384ac64a83d40f13ebeee2
 SHA512:
-  metadata.gz: f36f814b284024e1d99bf37abf6cf37444db418d2c67cb980cbf8a80cb654ab36f5c1851e8a38d14e5de6cc7eeb70f3ed3c5201dab618071f0f0546522e5e217
-  data.tar.gz: e25c5f1dead47715cff47cb2458e7f9df44a0a87f682733fa475bd016ad1b5a7d9af9856564c8c2061394759eeed5ea92966e163fac8a83ec32f8093645136e7
+  metadata.gz: df821079aa71d5a95e283ea1135c23f9d2521537253134ad87bb03c0d726822e760f696fece3abf7146d954cdd3fa2cfddbd3a6415916929abdd4058611970ea
+  data.tar.gz: f31b0bedebf53f032337be404dd17181cc3007dd47b86f5003e0b89528e6620d84377189e5e0dfae7b4c512d5d6a14d91297f439d4f6aa7416c143a78aca7e8c

data/.gitignore

@@ -1,15 +1,15 @@
 *.gem
-._*
 .*.swp
-.bundle
 .DS_Store
-.rbenv-version
-.rvmrc
+._*
 .sass-cache
-config/config.yml
-config/deploy.rb
-db/*.db
-pkg/*
-plugins
-public/cache
-spec/tmp
+/.rbenv-version
+/.ruby-version
+/.rvmrc
+/config/config.yml
+/config/deploy.rb
+/db/*.db
+/pkg/*
+/plugins
+/public/cache
+/spec/tmp

data/.hound.yml

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

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.5
+  - 2.2.1

data/CHANGES

@@ -1,3 +1,46 @@
+= 0.11.0 / (16 March 2015)
+
+ * Allow Haml pages to use the built-in Markdown filter again, by
+   including the haml-contrib gem.
+   (Jake Owens)
+
+ * When building the breadcrumb (e.g. "Home > Category > Page") for a
+   page whose URL is at the top level of a site, include a page's first
+   category in the breadcrumb.
+   See https://github.com/gma/nesta/issues/147 for an example.
+   (Jake Owens)
+
+ * Print an error message when one of Nesta's command line tools calls
+   an external process (e.g. `git`), but the command doesn't return
+   successfully. (Graham Ashton)
+
+ * When the menu.txt pointed to a page that didn't exist, Nesta would
+   silently stop generating the menu, and links to pages further down
+   the file would be ignored. This is now fixed; the missing page is
+   ignored and the rest of the menu is generated. (Jake Owens)
+
+ * Nesta previously expected all Markdown files to be named with a
+   `.mdown` extension. The (commonly used) `.md` extension is now
+   supported as well. (Phillip Miller)
+
+ * The Google Analytics JavaScript code has been updated to their
+   Universal Analytics version. (Graham Ashton)
+
+ * Relax restrictions on how Nesta can be configured. Previously Nesta
+   would only read if `config.yml` file if there weren't any environment
+   variables set. This restriction is historic, and unhelpful.
+   See https://github.com/gma/nesta/commit/bac50974 for details.
+   (Glenn Gillen)
+
+ * Plugins are distributed as gems. We've previously relied upon Bundler
+   to generate plugin gems for us, but when Bundler changed the format
+   of its generated gems they no longer worked with Nesta. Nesta now
+   generates gems from scratch (from a template), which removes our
+   dependency on a third party tool.
+   (Jake Owens, Glenn Gillen, Graham Ashton)
+
+ * Support for Ruby 2.2. (Graham Ashton)
+
 = 0.10.0 / (25 April 2014)
 
  * Upgraded the default theme to a responsive design, using Google's

data/Gemfile

@@ -3,4 +3,4 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in nesta.gemspec
 gemspec
 
-gem 'debugger'
+# gem (RUBY_VERSION =~ /^1/) ? 'debugger' : 'byebug'

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    nesta (0.10.0)
+    nesta (0.11.0)
       RedCloth (~> 4.2)
       haml (>= 3.1)
+      haml-contrib (>= 1.0)
       rack (>= 1.3)
       rdiscount (~> 2.1)
       sass (>= 3.1)
@@ -13,45 +14,40 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    columnize (0.8.9)
-    debugger (1.6.6)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
-    ffi (1.9.3)
-    haml (4.0.5)
+    ffi (1.9.8)
+    haml (4.0.6)
       tilt
-    hoe (3.12.0)
+    haml-contrib (1.0.0.1)
+      haml (>= 3.2.0.alpha.13)
+    hoe (3.13.1)
       rake (>= 0.8, < 11.0)
-    kgio (2.9.2)
+    kgio (2.9.3)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mini_portile (0.5.3)
+    mini_portile (0.6.2)
     mr-sparkle (0.3.0)
       listen (~> 1.0)
       rb-fsevent (>= 0.9)
       rb-inotify (>= 0.8)
       unicorn (>= 4.5)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    rack (1.5.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
     raindrops (0.13.0)
-    rake (10.3.1)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    rdiscount (2.1.7.1)
+    rdiscount (2.1.8)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -60,7 +56,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sass (3.3.5)
+    sass (3.4.13)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -68,7 +64,7 @@ GEM
     test-unit (1.2.3)
       hoe (>= 1.5.1)
     tilt (1.4.1)
-    unicorn (4.8.2)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -81,7 +77,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  debugger
   mr-sparkle (>= 0.0.2)
   nesta!
   rack-test (= 0.6.1)

data/lib/nesta/app.rb

@@ -23,11 +23,6 @@ module Nesta
     helpers Navigation::Renderers
     helpers View::Helpers
 
-    def cache(content)
-      Nesta.deprecated('cache', "it's no longer required - remove it from app.rb")
-      content
-    end
-
     before do
       if request.path_info =~ Regexp.new('./$')
         redirect to(request.path_info.sub(Regexp.new('/$'), ''))

data/lib/nesta/commands.rb

@@ -6,291 +6,8 @@ require File.expand_path('app', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
 require File.expand_path('version', File.dirname(__FILE__))
 
-module Nesta
-  module Commands
-    class UsageError < RuntimeError; end
-
-    module Command
-      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)))
-        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
-
-    class Edit
-      include Command
-
-      def initialize(*args)
-        @filename = Nesta::Config.page_path(args.shift)
-      end
-
-      def execute
-        editor = ENV.fetch('EDITOR')
-      rescue IndexError
-        $stderr.puts "No editor: set EDITOR environment variable"
-      else
-        system(editor, @filename)
-      end
-    end
-
-    class New
-      include Command
-
-      def initialize(*args)
-        path = args.shift
-        options = args.shift || {}
-        path.nil? && (raise UsageError.new('path not specified'))
-        if File.exist?(path)
-          raise RuntimeError.new("#{path} already exists") 
-        end
-        @path = path
-        @options = options
-      end
-
-      def make_directories
-        %w[content/attachments content/pages].each do |dir|
-          FileUtils.mkdir_p(File.join(@path, dir))
-        end
-      end
-
-      def have_rake_tasks?
-        @options['vlad']
-      end
-
-      def create_repository
-        FileUtils.cd(@path) do
-          File.open('.gitignore', 'w') do |file|
-            file.puts %w[._* .*.swp .bundle .DS_Store .sass-cache].join("\n")
-          end
-          system('git', 'init')
-          system('git', 'add', '.')
-          system('git', 'commit', '-m', 'Initial commit')
-        end
-      end
-
-      def execute
-        make_directories
-        templates = {
-          'config.ru' => "#{@path}/config.ru",
-          'config/config.yml' => "#{@path}/config/config.yml",
-          'index.haml' => "#{@path}/content/pages/index.haml",
-          'Gemfile' => "#{@path}/Gemfile"
-        }
-        templates['Rakefile'] = "#{@path}/Rakefile" if have_rake_tasks?
-        if @options['vlad']
-          templates['config/deploy.rb'] = "#{@path}/config/deploy.rb"
-        end
-        copy_templates(templates)
-        create_repository if @options['git']
-      end
-    end
-
-    module Demo
-      class Content
-        include Command
-
-        def initialize(*args)
-          @dir = 'content-demo'
-        end
-
-        def clone_or_update_repository
-          repository = 'git://github.com/gma/nesta-demo-content.git'
-          path = Nesta::Path.local(@dir)
-          if File.exist?(path)
-            FileUtils.cd(path) { system('git', 'pull', 'origin', 'master') }
-          else
-            system('git', 'clone', repository, path)
-          end
-        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 }
-          end
-        end
-
-        def execute
-          clone_or_update_repository
-          configure_git_to_ignore_repo
-          update_config_yaml(/^\s*#?\s*content:.*/, "content: #{@dir}")
-        end
-      end
-    end
-
-    module Plugin
-      class Create
-        def initialize(*args)
-          name = args.shift
-          name.nil? && (raise UsageError.new('name not specified'))
-          @name = name
-          @gem_name = "nesta-plugin-#{name}"
-          if File.exist?(@gem_name)
-            raise RuntimeError.new("#{@gem_name} already exists")
-          end
-        end
-
-        def lib_path(*parts)
-          File.join(@gem_name, 'lib', *parts)
-        end
-
-        def modify_required_file
-          File.open(lib_path("#{@gem_name}.rb"), 'w') do |file|
-            file.write <<-EOF
-require "#{@gem_name}/version"
-
-Nesta::Plugin.register(__FILE__)
-            EOF
-          end
-        end
-
-        def modify_init_file
-          module_name = @name.split('-').map { |name| name.capitalize }.join('::')
-          File.open(lib_path(@gem_name, 'init.rb'), 'w') do |file|
-            file.puts <<-EOF
-module Nesta
-  module Plugin
-    module #{module_name}
-      module Helpers
-        # If your plugin needs any helper methods, add them here...
-      end
-    end
-  end
-
-  class App
-    helpers Nesta::Plugin::#{module_name}::Helpers
-  end
-end
-            EOF
-          end
-        end
-
-        def specify_gem_dependency
-          gemspec = File.join(@gem_name, "#{@gem_name}.gemspec")
-          File.open(gemspec, 'r+') do |file|
-            output = ''
-            file.each_line do |line|
-              if line =~ /^end/
-                output << '  gem.add_dependency("nesta", ">= 0.9.11")' + "\n"
-                output << '  gem.add_development_dependency("rake")' + "\n"
-              end
-              output << line
-            end
-            file.pos = 0
-            file.print(output)
-            file.truncate(file.pos)
-          end
-        end
-
-        def execute
-          system('bundle', 'gem', @gem_name)
-          modify_required_file
-          modify_init_file
-          specify_gem_dependency
-          Dir.chdir(@gem_name) { system('git', 'add', '.') }
-        end
-      end
-    end
-
-    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)
-        end
-
-        def make_directories
-          FileUtils.mkdir_p(File.join(@theme_path, 'public', @name))
-          FileUtils.mkdir_p(File.join(@theme_path, 'views'))
-        end
-
-        def execute
-          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"
-          )
-        end
-      end
-
-      class Install
-        include Command
-
-        def initialize(*args)
-          url = args.shift
-          options = args.shift || {}
-          url.nil? && (raise UsageError.new('URL not specified'))
-          @url = url
-          @name = File.basename(url, '.git').sub(/nesta-theme-/, '')
-        end
-
-        def execute
-          system('git', 'clone', @url, "themes/#{@name}")
-          FileUtils.rm_r(File.join("themes/#{@name}", '.git'))
-          enable
-        end
-
-        def enable
-          Enable.new(@name).execute
-        end
-      end
-
-      class Enable
-        include Command
-
-        def initialize(*args)
-          name = args.shift
-          options = args.shift || {}
-          name.nil? && (raise UsageError.new('name not specified'))
-          @name = name
-        end
-
-        def execute
-          update_config_yaml(/^\s*#?\s*theme:.*/, "theme: #{@name}")
-        end
-      end
-    end
-  end
-end
+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/theme', File.dirname(__FILE__))