nesta 0.10.0 → 0.11.0

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/nesta.gemspec

@@ -32,6 +32,7 @@ EOF
   s.require_paths = ["lib"]
 
   s.add_dependency('haml', '>= 3.1')
+  s.add_dependency('haml-contrib', '>= 1.0')
   s.add_dependency('sass', '>= 3.1')
   s.add_dependency('rdiscount', '~> 2.1')
   s.add_dependency('RedCloth', '~> 4.2')

data/smoke-test.sh

@@ -5,10 +5,12 @@
 # Ruby.
 #
 # It assumes you've got the relevant versions of Ruby installed locally
-# via rbenv.
+# via chruby.
 
 
-RUBIES="1.9.3-p392 2.0.0-p353 2.1.0 2.1.1"
+source /usr/local/opt/chruby/share/chruby/chruby.sh
+
+RUBIES="ruby-2.0.0-p598 ruby-2.1.5 ruby-2.2.1"
 
 
 ## Functions
@@ -36,27 +38,32 @@ gem_file()
     echo "nesta-$(nesta_version).gem"
 }
 
+run_with_ruby()
+{
+    chruby-exec $RUBY_VERSION -- $@
+}
+
 get_ruby()
 {
-    # Why not just use RUBY_VERSION? Because tmux can prevent rbenv from
-    # changing the local version if the RBENV_VERSION variable is set in
-    # another session. If we don't notice we'll think we've been testing
-    # Nesta under multiple versions, but in fact we'll just have been
-    # testing it under the same copy of Ruby every time.
-    ruby --version | cut -f 2 -d ' '
+    # Why not just use RUBY_VERSION? Because tmux can prevent child
+    # processes from changing the local version if the RBENV_VERSION
+    # variable is set in another session. If we don't notice we'll think
+    # we've been testing Nesta under multiple versions, but in fact
+    # we'll just have been testing it under the same copy of Ruby every
+    # time.
+    run_with_ruby ruby --version | cut -f 2 -d ' '
 }
 
 run_tests()
 {
-    bundle install
-    bundle exec rake spec
+    run_with_ruby bundle install
+    run_with_ruby bundle exec rake spec
 }
 
 build_and_install()
 {
     echo rm -f pkg/$(gem_file)
-    bundle install
-    bundle exec rake install
+    run_with_ruby bundle exec rake install
 }
 
 site_folder()
@@ -66,15 +73,14 @@ site_folder()
 
 create_and_test_new_site()
 {
-    bundle exec nesta new $(site_folder)
+    run_with_ruby bundle exec nesta new $(site_folder)
     cd $(site_folder)
-    echo "gem 'haml-contrib'" >> Gemfile
-    bundle install
-    bundle exec nesta demo:content
+    run_with_ruby bundle install
+    run_with_ruby bundle exec nesta demo:content
 
     log "Starting server in $(site_folder)"
     set +e
-    bundle exec mr-sparkle
+    run_with_ruby bundle exec mr-sparkle
     set -e
 
     cd - >/dev/null
@@ -85,10 +91,9 @@ create_and_test_new_site()
 ## Main program
 
 set -e
-[ -n "$DEBUG" ] && set -x
+[ "$DEBUG" ] && set -x
 
 for RUBY_VERSION in $RUBIES; do
-    rbenv local $RUBY_VERSION
     log "Rebuilding nesta gem with Ruby $(get_ruby)"
 
     run_tests

data/spec/commands/demo/content_spec.rb

@@ -0,0 +1,65 @@
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../../lib/nesta/commands', File.dirname(__FILE__))
+
+describe "nesta:demo:content" do
+  include_context "temporary working directory"
+
+  before(:each) do
+    @config_path = project_path('config/config.yml')
+    FileUtils.mkdir_p(File.dirname(@config_path))
+    Nesta::Config.stub(:yaml_path).and_return(@config_path)
+    create_config_yaml('content: path/to/content')
+    Nesta::App.stub(:root).and_return(@project_path)
+    @repo_url = 'git://github.com/gma/nesta-demo-content.git'
+    @demo_path = project_path('content-demo')
+    @command = Nesta::Commands::Demo::Content.new
+    @command.stub(:run_process)
+  end
+
+  it "should clone the repository" do
+    @command.should_receive(:run_process).with(
+        'git', 'clone', @repo_url, @demo_path)
+    @command.execute
+  end
+
+  it "should configure the content directory" do
+    @command.execute
+    File.read(@config_path).should match(/^content: content-demo/)
+  end
+
+  describe "when repository already exists" do
+    before(:each) do
+      FileUtils.mkdir_p(@demo_path)
+    end
+
+    it "should update the repository" do
+      @command.should_receive(:run_process).with(
+          'git', 'pull', 'origin', 'master')
+      @command.execute
+    end
+  end
+
+  describe "when site versioned with git" do
+    before(:each) do
+      @exclude_path = project_path('.git/info/exclude')
+      FileUtils.mkdir_p(File.dirname(@exclude_path))
+      File.open(@exclude_path, 'w') { |file| file.puts '# Excludes' }
+    end
+
+    it "should tell git to ignore content-demo" do
+      @command.execute
+      File.read(@exclude_path).should match(/content-demo/)
+    end
+
+    describe "and content-demo already ignored" do
+      before(:each) do
+        File.open(@exclude_path, 'w') { |file| file.puts 'content-demo' }
+      end
+
+      it "shouldn't tell git to ignore it twice" do
+        @command.execute
+        File.read(@exclude_path).scan('content-demo').size.should == 1
+      end
+    end
+  end
+end

data/spec/commands/edit_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../lib/nesta/commands', File.dirname(__FILE__))
+
+describe "nesta:edit" do
+  include_context "temporary working directory"
+
+  before(:each) do
+    Nesta::Config.stub(:content_path).and_return('content')
+    @page_path = 'path/to/page.mdown'
+    @command = Nesta::Commands::Edit.new(@page_path)
+    @command.stub(:run_process)
+  end
+
+  it "should launch the editor" do
+    ENV['EDITOR'] = 'vi'
+    full_path = File.join('content/pages', @page_path)
+    @command.should_receive(:run_process).with(ENV['EDITOR'], full_path)
+    @command.execute
+  end
+
+  it "should not try and launch an editor if environment not setup" do
+    ENV.delete('EDITOR')
+    @command.should_not_receive(:run_process)
+    $stderr.stub(:puts)
+    @command.execute
+  end
+end

data/spec/commands/new_spec.rb

@@ -0,0 +1,88 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../lib/nesta/commands', File.dirname(__FILE__))
+
+describe "nesta:new" do
+  include_context "temporary working directory"
+
+  def gemfile_source
+    File.read(project_path('Gemfile'))
+  end
+
+  def rakefile_source
+    File.read(project_path('Rakefile'))
+  end
+
+  describe "without options" do
+    before(:each) do
+      Nesta::Commands::New.new(@project_path).execute
+    end
+
+    it "should create the content directories" do
+      should_exist('content/attachments')
+      should_exist('content/pages')
+    end
+
+    it "should create the home page" do
+      should_exist('content/pages/index.haml')
+    end
+
+    it "should create the rackup file" do
+      should_exist('config.ru')
+    end
+
+    it "should create the config.yml file" do
+      should_exist('config/config.yml')
+    end
+
+    it "should add a Gemfile" do
+      should_exist('Gemfile')
+      gemfile_source.should match(/gem 'nesta'/)
+    end
+  end
+
+  describe "--git" do
+    before(:each) do
+      @command = Nesta::Commands::New.new(@project_path, 'git' => '')
+      @command.stub(:run_process)
+    end
+
+    it "should create a .gitignore file" do
+      @command.execute
+      File.read(project_path('.gitignore')).should match(/\.bundle/)
+    end
+
+    it "should create a git repo" do
+      @command.should_receive(:run_process).with('git', 'init')
+      @command.execute
+    end
+
+    it "should commit the blank project" do
+      @command.should_receive(:run_process).with('git', 'add', '.')
+      @command.should_receive(:run_process).with(
+          'git', 'commit', '-m', 'Initial commit')
+      @command.execute
+    end
+  end
+
+  describe "--vlad" do
+    before(:each) do
+      Nesta::Commands::New.new(@project_path, 'vlad' => '').execute
+    end
+
+    it "should add vlad to Gemfile" do
+      gemfile_source.should match(/gem 'vlad', '2.1.0'/)
+      gemfile_source.should match(/gem 'vlad-git', '2.2.0'/)
+    end
+
+    it "should configure the vlad rake tasks" do
+      should_exist('Rakefile')
+      rakefile_source.should match(/require 'vlad'/)
+    end
+
+    it "should create deploy.rb" do
+      should_exist('config/deploy.rb')
+      deploy_source = File.read(project_path('config/deploy.rb'))
+      deploy_source.should match(/set :application, 'mysite.com'/)
+    end
+  end
+end

data/spec/commands/plugin/create_spec.rb

@@ -0,0 +1,97 @@
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../../lib/nesta/commands', File.dirname(__FILE__))
+
+describe 'nesta:plugin:create' do
+  include_context 'temporary working directory'
+
+  def path_in_gem(path)
+    File.join(@gem_name, path)
+  end
+
+  def should_exist(path)
+    File.exist?(path_in_gem(path)).should be_true
+  end
+
+  def should_contain(path, pattern)
+    contents = File.read(path_in_gem(path))
+    contents.should match(pattern)
+  end
+
+  before(:each) do
+    @name = 'my-feature'
+    @gem_name = "nesta-plugin-#{@name}"
+    @plugins_path = temp_path('plugins')
+    @working_dir = Dir.pwd
+    Dir.mkdir(@plugins_path)
+    Dir.chdir(@plugins_path)
+    Nesta::Commands::Plugin::Create.any_instance.stub(:system)
+    Nesta::Commands::Plugin::Create.new(@name).execute
+  end
+
+  after(:each) do
+    Dir.chdir(@working_dir)
+    FileUtils.rm_r(@plugins_path)
+  end
+
+  it "creates the gem's directory" do
+    File.directory?(@gem_name).should be_true
+  end
+
+  it 'creates a README.md file with installation instructions' do
+    should_exist('README.md')
+    should_contain('README.md', %r{echo 'gem "#{@gem_name}"' >> Gemfile})
+  end
+
+  it 'creates .gitignore' do
+    should_exist('.gitignore')
+  end
+
+  it 'creates the gemspec' do
+    path = "#{@gem_name}.gemspec"
+    should_exist(path)
+    should_contain(path, %r{require "#{@gem_name}/version"})
+    should_contain(path, %r{Nesta::Plugin::My::Feature::VERSION})
+  end
+
+  it 'creates a Gemfile' do
+    should_exist('Gemfile')
+  end
+
+  it 'creates Rakefile that helps with packaging the gem' do
+    should_exist("Rakefile")
+  end
+
+  it 'creates default folder for Ruby files' do
+    code_directory = File.join(@gem_name, 'lib', @gem_name)
+    File.directory?(code_directory).should be_true
+  end
+
+  it 'creates file required when gem loaded' do
+    path = "#{File.join('lib', @gem_name)}.rb"
+    should_exist(path)
+    should_contain(path, %r{require "#{@gem_name}/version"})
+  end
+
+  it 'creates version.rb' do
+    path = File.join('lib', @gem_name, 'version.rb')
+    should_exist(path)
+    should_contain path, <<-EOF
+module Nesta
+  module Plugin
+    module My
+      module Feature
+        VERSION = '0.1.0'
+      end
+    end
+  end
+end
+    EOF
+  end
+
+  it 'creates skeleton code for the plugin in init.rb' do
+    path = File.join('lib', @gem_name, 'init.rb')
+    should_exist(path)
+    should_contain(path, "module Nesta\n  module Plugin\n    module My::Feature")
+    should_contain(path, 'helpers Nesta::Plugin::My::Feature::Helpers')
+  end
+end

data/spec/commands/system_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../lib/nesta/commands', File.dirname(__FILE__))
+
+class TestCommand
+  include Nesta::Commands::Command
+end
+
+describe "Nesta::Commands::Command.run_process" do
+  before do
+    @stderr = $stderr
+    $stderr = File.new('/dev/null', 'w')
+  end
+
+  after do
+    $stderr.close
+    $stderr = @stderr
+  end
+
+  it 'can run an external process and catch errors' do
+    TestCommand.new.run_process('ls / >/dev/null')
+    expect {
+      TestCommand.new.run_process('ls /no-such-file 2>/dev/null')
+    }.to raise_error(SystemExit)
+  end
+end

data/spec/commands/theme/create_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../../lib/nesta/commands', File.dirname(__FILE__))
+
+describe "nesta:theme:create" do
+  include_context "temporary working directory"
+
+  def should_exist(file)
+    File.exist?(Nesta::Path.themes(@name, file)).should be_true
+  end
+
+  before(:each) do
+    Nesta::App.stub(:root).and_return(TempFileHelper::TEMP_DIR)
+    @name = 'my-new-theme'
+    Nesta::Commands::Theme::Create.new(@name).execute
+  end
+
+  it "should create the theme directory" do
+    File.directory?(Nesta::Path.themes(@name)).should be_true
+  end
+
+  it "should create a dummy README file" do
+    should_exist('README.md')
+    text = File.read(Nesta::Path.themes(@name, 'README.md'))
+    text.should match(/#{@name} is a theme/)
+  end
+
+  it "should create a default app.rb file" do
+    should_exist('app.rb')
+  end
+
+  it "should create public and views directories" do
+    should_exist("public/#{@name}")
+    should_exist('views')
+  end
+
+  it "should copy the default view templates into views" do
+    %w(layout.haml page.haml master.sass).each do |file|
+      should_exist("views/#{file}")
+    end
+  end
+end