algerb 0.0.2 → 0.0.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.0.3, released 2012-01-02
+
+* FIX: some files were lost from generated autoloader script.
+
 == 0.0.2, released 2012-01-01
 
 * FIX: algerb command installed with RubyGems not worked:

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/algerb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "algerb"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuya Takeyama"]

data/lib/algerb/files.rb

@@ -1,5 +1,6 @@
 class Algerb::Files
   include ::Enumerable
+  include Algerb::Util
 
   attr_reader :name, :files
 
@@ -8,15 +9,27 @@ class Algerb::Files
     @files = files
   end
 
+  def self.root(files = {})
+    new(nil, files)
+  end
+
   def add(file)
-    if @files.has_key?(file.name)
-      file.files.each do |name, _file|
-        @files[file.name].files[name] = _file
+    @files[file.name] = file unless @files.has_key?(file.name)
+    self
+  end
+
+  def find_by_path(path)
+    next_path, rest = split_path_as_head_and_tail(path)
+    if files.has_key?(next_path)
+      found = files[next_path]
+      if rest.nil?
+        found
+      elsif found.is_a?(Algerb::Files)
+        found.find_by_path(rest)
+      else
+        found
       end
-    else
-      @files[file.name] = file
     end
-    self
   end
 
   def ==(another)

data/lib/algerb/files_builder.rb

@@ -1,4 +1,6 @@
 class Algerb::FilesBuilder
+  include Algerb::Util
+
   attr_reader :files
 
   FILE_PATTERN = %r{^([a-z0-9\_\.])/?}
@@ -8,13 +10,22 @@ class Algerb::FilesBuilder
   end
 
   def add(path)
-    paths = path.split('/').reverse
-    file = Algerb::File.new(paths.slice!(0, 1)[0])
-    files = paths.inject(file) do |file, path|
-      files = Algerb::Files.new(path).add(file)
-      files
+    dir, file = split_dir_and_file(path)
+    if dir
+      mkdir_p(dir)
+      files.find_by_path(dir).add(Algerb::File.new(file))
+    else
+      files.add(Algerb::File.new(file))
     end
-    @files.add files
     self
   end
+
+  def mkdir_p(path)
+    target = files
+    while path
+      dir, path = split_path_as_head_and_tail(path)
+      target.add(Algerb::Files.new(dir))
+      target = target.find_by_path(dir)
+    end
+  end
 end

data/lib/algerb/util.rb

@@ -14,4 +14,12 @@ module Algerb::Util
   def remove_ext(path)
     path.sub(/\.rb$/, '')
   end
+
+  def split_dir_and_file(path)
+    path.scan(%r{^(?:(.*)/)?([^/]+)$})[0]
+  end
+
+  def split_path_as_head_and_tail(path)
+    path.split('/', 2)
+  end
 end

data/spec/unit/algerb/files_builder_spec.rb

@@ -12,12 +12,22 @@ describe Algerb::FilesBuilder do
 
     context 'when 1 file ("foo.rb") is added' do
       before { builder.add('foo.rb') }
-      it { should == Algerb::Files.new.add(Algerb::File.new('foo.rb'))}
+      it {
+        should == Algerb::Files.root({
+                    'foo.rb' => Algerb::File.new('foo.rb'),
+                  })
+      }
     end
 
     context 'when 1 file ("foo/bar.rb") is added' do
       before { builder.add('foo/bar.rb') }
-      it { should == Algerb::Files.new.add(Algerb::Files.new('foo').add(Algerb::File.new('bar.rb')))}
+      it {
+        should == Algerb::Files.root(
+                    'foo' => Algerb::Files.new('foo', {
+                      'bar.rb' => Algerb::File.new('bar.rb'),
+                    })
+                  )
+      }
     end
 
     context 'when 2 files ("foo/bar.rb", "foo/baz.rb") are added' do
@@ -25,7 +35,96 @@ describe Algerb::FilesBuilder do
         builder.add('foo/bar.rb')
         builder.add('foo/baz.rb')
       end
-      it { should == Algerb::Files.new.add(Algerb::Files.new('foo').add(Algerb::File.new('bar.rb')).add(Algerb::File.new('baz.rb'))) }
+      it {
+        should == Algerb::Files.root(
+                    'foo' => Algerb::Files.new('foo', {
+                      'bar.rb' => Algerb::File.new('bar.rb'),
+                      'baz.rb' => Algerb::File.new('baz.rb'),
+                    })
+                  )
+      }
+    end
+
+    context 'when a files is added to nested directory' do
+      before do
+        builder.add('foo/bar/baz.rb')
+        builder.add('foo/bar/foo_bar.rb')
+      end
+      it {
+        should == Algerb::Files.root(
+                    'foo' => Algerb::Files.new('foo',
+                      'bar' => Algerb::Files.new('bar', {
+                        'baz.rb' => Algerb::File.new('baz.rb'),
+                        'foo_bar.rb' => Algerb::File.new('foo_bar.rb'),
+                      })
+                    )
+                  )
+      }
+    end
+  end
+
+  describe '#mkdir_p' do
+    subject { builder.files }
+
+    shared_examples_for 'create directory correctly' do
+      it { should == expected }
+    end
+
+    context 'no directories are conflicted' do
+      before { builder.mkdir_p(path) }
+
+      context 'foo' do
+        let(:path) { 'foo' }
+        let(:expected) do
+          Algerb::Files.root(
+            'foo' => Algerb::Files.new('foo')
+          )
+        end
+        it_should_behave_like 'create directory correctly'
+      end
+
+      context 'foo/bar' do
+        let(:path) { 'foo/bar' }
+        let(:expected) do
+          Algerb::Files.root(
+            'foo' => Algerb::Files.new('foo',
+              'bar' => Algerb::Files.new('bar')
+            )
+          )
+        end
+        it_should_behave_like 'create directory correctly'
+      end
+
+      context 'foo/bar/baz' do
+        let(:path) { 'foo/bar/baz' }
+        let(:expected) do
+          Algerb::Files.root(
+            'foo' => Algerb::Files.new('foo',
+              'bar' => Algerb::Files.new('bar',
+                'baz' => Algerb::Files.new('baz')
+              )
+            )
+          )
+        end
+        it_should_behave_like 'create directory correctly'
+      end
+    end
+
+    context 'directories are conflicted' do
+      before do
+        builder.add('foo/bar/baz.rb')
+        builder.mkdir_p('foo/bar')
+      end
+
+      it {
+        should == Algerb::Files.root(
+          'foo' => Algerb::Files.new('foo',
+            'bar' => Algerb::Files.new('bar',
+              'baz.rb' => Algerb::File.new('baz.rb')
+            )
+          )
+        )
+      }
     end
   end
 end

data/spec/unit/algerb/files_spec.rb

@@ -48,4 +48,43 @@ describe Algerb::Files do
       it { should == {'foo' => dir1, 'bar' => dir2} }
     end
   end
+
+  describe '#find_by_path' do
+    context 'when no files are matched' do
+      subject { root.find_by_path('foo.rb') }
+      it { should be_nil }
+    end
+
+    context 'when a file is matched in the root' do
+      before { root.add(Algerb::File.new('foo.rb')) }
+      subject { root.find_by_path('foo.rb') }
+      it { should == Algerb::File.new('foo.rb') }
+    end
+
+    context 'when a file is matched in a directory' do
+      before do
+        root.add(Algerb::Files.new('foo',
+          'bar.rb' => Algerb::File.new('bar.rb')
+        ))
+      end
+      subject { root.find_by_path('foo/bar.rb') }
+      it { should == Algerb::File.new('bar.rb') }
+    end
+
+    context 'when a directory is matched in the root' do
+      before { root.add(Algerb::Files.new('foo')) }
+      subject { root.find_by_path('foo') }
+      it { should == Algerb::Files.new('foo') }
+    end
+
+    context 'when a directory is matched in a directory' do
+      before do
+        root.add(Algerb::Files.new('foo',
+          'bar' => Algerb::Files.new('bar')
+        ))
+      end
+      subject { root.find_by_path('foo/bar') }
+      it { should == Algerb::Files.new('bar') }
+    end
+  end
 end

data/spec/unit/algerb/util_spec.rb

@@ -75,4 +75,50 @@ describe Algerb::Util do
       it { should == 'foo/bar' }
     end
   end
+
+  describe '#split_dir_and_file' do
+    subject { split_dir_and_file(path) }
+
+    context 'foo.rb' do
+      let(:path) { 'foo.rb' }
+      it { should == [nil, 'foo.rb'] }
+    end
+
+    context 'foo/bar.rb' do
+      let(:path) { 'foo/bar.rb' }
+      it { should == ['foo', 'bar.rb'] }
+    end
+
+    context 'foo/bar/baz.rb' do
+      let(:path) { 'foo/bar/baz.rb' }
+      it { should == ['foo/bar', 'baz.rb'] }
+    end
+  end
+
+  describe '#split_path_as_head_and_tail' do
+    subject { split_path_as_head_and_tail(path) }
+
+    shared_examples_for 'head and tail are correct' do
+      it { should == [head, tail] }
+    end
+
+    context 'foo.rb' do
+      let(:path) { 'foo.rb' }
+      it { should == ['foo.rb'] }
+    end
+
+    context 'foo/bar.rb' do
+      let(:path) { 'foo/bar.rb' }
+      let(:head) { 'foo' }
+      let(:tail) { 'bar.rb' }
+      it_should_behave_like 'head and tail are correct'
+    end
+
+    context 'foo/bar/baz.rb' do
+      let(:path) { 'foo/bar/baz.rb' }
+      let(:head) { 'foo' }
+      let(:tail) { 'bar/baz.rb' }
+      it_should_behave_like 'head and tail are correct'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: algerb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &27852240 !ruby/object:Gem::Requirement
+  requirement: &17515760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27852240
+  version_requirements: *17515760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &27851540 !ruby/object:Gem::Requirement
+  requirement: &17515060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27851540
+  version_requirements: *17515060
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &27850800 !ruby/object:Gem::Requirement
+  requirement: &17514140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27850800
+  version_requirements: *17514140
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &27850100 !ruby/object:Gem::Requirement
+  requirement: &17513560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27850100
+  version_requirements: *17513560
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &27806440 !ruby/object:Gem::Requirement
+  requirement: &17461800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27806440
+  version_requirements: *17461800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27805860 !ruby/object:Gem::Requirement
+  requirement: &17461280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27805860
+  version_requirements: *17461280
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &27805200 !ruby/object:Gem::Requirement
+  requirement: &17460620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27805200
+  version_requirements: *17460620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27804600 !ruby/object:Gem::Requirement
+  requirement: &17460020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *27804600
+  version_requirements: *17460020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &27804040 !ruby/object:Gem::Requirement
+  requirement: &17459400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27804040
+  version_requirements: *17459400
 description: Generates autoloader script for your Ruby library.
 email: sign.of.the.wolf.pentagram@gmail.com
 executables:
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4221084203019020392
+      hash: -478649244556644149
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: