nanoc-oo 0.0.4 → 0.0.5

data/bin/nanoc-oo

@@ -14,5 +14,4 @@ class CLI < Thor::Group
   def self.banner; super.sub('cli ','') end
 end
 
-ARGV << '--help' if ARGV.empty?
 CLI.start

data/data/nanoc-oo/wrapper/Rules

@@ -112,4 +112,6 @@ end
 #
 # FIXME "if" just for specs, to prevent crashes
 #
-Builder.build! root(fake.items, classes), self, fake if fake.items.count > 0
+Builder.build! root(fake.items, classes), self, fake if fake.items.count > 0
+
+__END__

data/features/cli.feature

@@ -0,0 +1,33 @@
+Feature: command line interface
+
+  Scenario: nanoc output
+    When $ nanoc-oo mysite
+    Then the output should contain "Enjoy!"
+    When $ nanoc-oo mysite
+    Then the output should contain "already exists"
+
+  Scenario: (no side effect between features I)
+    When $ nanoc-oo thesite
+    Then the output should contain "Enjoy!"
+  Scenario: (no side effect between features II)
+    When $ nanoc-oo thesite
+    Then the output should contain "Enjoy!"    
+
+  Scenario: create site
+    When $ nanoc-oo site
+    Then a file named "site/Rules" should exist
+    And a file named "site/content/index.html" should exist
+
+  Scenario: create blank site
+    When $ nanoc-oo site --blank
+    Then a file named "site/Rules" should exist
+    And a file named "site/content/index.html" should not exist  
+
+  Scenario: Rules file is replaced
+    When $ nanoc-oo site
+    Then the file "site/Rules" should contain "FakeItem"
+
+  Scenario: it describes actions
+    When $ nanoc-oo thesite
+    Then the output should contain "force"
+    Then the output should contain "classes"

data/features/move_children.example

@@ -1,4 +1,3 @@
-@wip
 Feature: move children items
 
   Background:
@@ -36,6 +35,10 @@ Feature: move children items
 
         class ThatItem < Page
           GOOD_ID = 'one/*'
+          
+          def route *a
+            super.sub 'one', 'two' # more declarative way to do this needed
+          end
         end
       """
     When I successfully compile it

data/features/step_definitions/complex_steps.rb

@@ -20,4 +20,13 @@ Step '(the )?*( files)? are the only (ones|files) in( the)? "*" directory' do |g
   missing = ideal - really
   step 'the following files should exist:', make_table(missing)
   step 'the following files should not exist:', make_table(extra)
-end
+end
+
+Step 'the following empty files exist:' do |table|
+  table.raw.map{|x|x[0]}.each do |file|
+    step 'an empty file named "%s"' % file
+  end
+  # table is a Cucumber::Ast::Table
+  #pending # express the regexp above with the code you wish you had
+end
+

data/lib/nanoc-oo/version.rb

@@ -1,3 +1,3 @@
 module NanocOO
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/nanoc-oo.rb

@@ -1,26 +1,71 @@
 require "nanoc-oo/version"
-require 'fileutils'
+require 'thor'
+
+THIS_GEM = 'nanoc-oo'
+
+class ForcedDataCopier < Thor
+  include Thor::Actions
+  class_option :force, type: :boolean, default: true
+
+  desc 'copy',''
+  def copy source, dest
+    directory source, dest
+  end
+
+  def self.source_root
+    Gem.datadir(THIS_GEM)
+  end
+end
+
+class Force < Thor
+  include Thor::Actions
+  class_option :force, type: :boolean, default: true
+
+  def self.remove_file file
+    new.remove_file file
+  end
+end
+
 
 module NanocOO
-  include FileUtils
-  
   def create_site name, blank=false
-    `nanoc create-site #{name}`
+    system "nanoc create-site #{name}"
     wrap name
     delete_content name if blank
   end
 
   def wrap dir
-    cp_r wrapper+'/.', dir
+    copier = ForcedDataCopier.new.copy 'wrapper', dir
+
+    #prepend_file join(dir,'Rules'), File.read(join(wrapper,'Rules'))
+    #directory 'lib', dir
+    #cp_r wrapper+'/.', dir
+#    act = Thor::Actions.new :force
+#    act.directory wrapper+'/.', dir
+  end
+
+  def data_dir
+    Gem.datadir('nanoc-oo')
   end
 
   def wrapper
-    File.join Gem.datadir('nanoc-oo'),  'wrapper'
+    join data_dir, 'wrapper'
   end
 
   def delete_content dir
-    rm_r Dir.glob File.join(dir,'content','*')
+    Dir.glob(join(dir,'content','*')).each do |supposedly_file|
+      Force.remove_file supposedly_file
+    end
   end
 
   extend self
+
+  # def source_root
+  #   File.expand_path(File.dirname(__FILE__))
+  # end
 end
+
+
+BEGIN{
+  def join *a; File.join *a end
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-oo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -180,6 +180,7 @@ files:
 - data/nanoc-oo/wrapper/lib/filter_for.rb
 - data/nanoc-oo/wrapper/lib/item_class.rb
 - features/_related_tests.feature
+- features/cli.feature
 - features/composite_file.example
 - features/move_children.example
 - features/paginate_article.example
@@ -195,7 +196,6 @@ files:
 - nanoc-oo.gemspec
 - old-README.md
 - spec/add_item_spec.rb
-- spec/cli/all_spec.rb
 - spec/item_children_and_comiling_spec.rb
 - spec/items_configuration_spec.rb
 - spec/layouts_spec.rb
@@ -243,6 +243,7 @@ specification_version: 3
 summary: nanoc wrapper with OO taste
 test_files:
 - features/_related_tests.feature
+- features/cli.feature
 - features/composite_file.example
 - features/move_children.example
 - features/paginate_article.example
@@ -254,7 +255,6 @@ test_files:
 - features/support/my_extension.rb
 - features/support/nice_steps.rb
 - spec/add_item_spec.rb
-- spec/cli/all_spec.rb
 - spec/item_children_and_comiling_spec.rb
 - spec/items_configuration_spec.rb
 - spec/layouts_spec.rb

data/spec/cli/all_spec.rb

@@ -1,61 +0,0 @@
-require 'nanoc-oo'
-
-describe NanocOO do
-  include FileUtils
-
-  let(:temp){ 'temp' }
-  let(:site){ "#{temp}/site" }
-  before :each do
-    rm_rf temp
-  end  
-  after :each do
-    rm_rf temp
-  end
-
-  it 'creates site with nanoc' do
-    `nanoc-oo #{site}`
-    File.should exist join(site,'Rules')
-    content_files.count.should > 0
-  end
-
-  it 'creates site with nanoc (w/o cli)' do
-    NanocOO.create_site site
-    File.should exist join(site,'Rules')
-    content_files.count.should > 0
-  end
-
-  it 'creates site without content if --blank specified' do
-    `nanoc-oo #{site} --blank`
-    File.should exist join(site,'Rules')
-    content_files.count.should == 0
-    Dir.should exist join(site,'content')
-  end
-
-  describe 'created site' do
-    before do
-      `nanoc-oo #{site}`
-    end
-
-    it 'is wrapped' do
-      read(join(site,'Rules')).should == read(join(NanocOO.wrapper,'Rules'))
-    end
-
-    context 'terminal outputs' do
-      specify 'nanoc output'
-      specify 'wrapping info'
-      specify '--help?'
-    end if false
-  end
-end
-
-BEGIN{
-  def join *a
-    File.join *a
-  end
-  def read *a
-    File.read *a
-  end
-  def content_files
-    Dir[join(site,'content','*')]
-  end
-}