tree.rb 0.3.12 → 0.3.13

data/spec/tree_rb/cli/cli_tree_sqlite_spec.rb

@@ -26,12 +26,12 @@ describe CliTree do
       args << File.join(FIXTURES, 'test_dir_1')
       CliTree.new.parse_args(args)
     end
-    File.exist?(@db_filename).should be_true
+    expect(File.exist?(@db_filename)).to be true
 
     db = SQLite3::Database.new(@db_filename)
     ar = db.execute('select count(*) from files')
     nr_files = ar[0][0]
-    nr_files.should == 3
+    expect(nr_files).to be == 3
     db.close
   end
 

data/spec/tree_rb/core/tree_dsl_spec.rb

@@ -24,7 +24,7 @@ root
 |   `-- l3
 `-- wo leaves
 EOS
-    tree.to_str.should == out
+    expect(tree.to_str).to be == out
   end
 
   it "test_dsl_block_with_arg" do
@@ -50,8 +50,8 @@ root
 |   `-- l3
 `-- woleaves
 EOS
-    tree.to_str.should ==  out
-    tree.find("l3").path_with_prefix.should == "pre/root/sub/l3"
+    expect(tree.to_str).to be ==  out
+    expect(tree.find("l3").path_with_prefix).to be == "pre/root/sub/l3"
   end
 
 end

data/spec/tree_rb/core/tree_dsl_with_derived_class1_spec.rb

@@ -44,6 +44,6 @@ a: droot
 `-- a: dsub
     `-- a: dl3
 EOS
-    tree.to_str.should == out
+    expect(tree.to_str).to be == out
   end
 end

data/spec/tree_rb/core/tree_dsl_with_derived_class_spec.rb

@@ -34,7 +34,7 @@ dt: root
 `-- dt: sub
     `-- dl: l3
 EOS
-    tree.to_str.should == out
+    expect(tree.to_str).to be == out
 
     tree = DTreeNode.create(DLeafNode) do
       node "root" do
@@ -45,7 +45,7 @@ EOS
         end
       end
     end
-    tree.to_str.should == out
+    expect(tree.to_str).to be == out
   end
 
 end

data/spec/tree_rb/core/tree_node_paths_spec.rb

@@ -15,55 +15,55 @@ describe TreeNode do
     end
 
     it "correct path" do
-      @tree.path.should == "a"
-      @sub_tree.path.should == "a/b"
-      @tree.path_with_prefix.should == "a"
-      @sub_tree.path_with_prefix.should == "a/b"
+      expect(@tree.path).to be == "a"
+      expect(@sub_tree.path).to be == "a/b"
+      expect(@tree.path_with_prefix).to be == "a"
+      expect(@sub_tree.path_with_prefix).to be == "a/b"
     end
 
     it "assign prefix path with a /" do
       @tree.prefix_path= "<root>/"
 
-      @tree.prefix_path.should == "<root>/"
-      @tree.path.should == "a"
-      @sub_tree.path.should == "a/b"
-      @tree.path_with_prefix.should == "<root>/a"
-      @sub_tree.path_with_prefix.should == "<root>/a/b"
+      expect(@tree.prefix_path).to be == "<root>/"
+      expect(@tree.path).to be == "a"
+      expect(@sub_tree.path).to be == "a/b"
+      expect(@tree.path_with_prefix).to be == "<root>/a"
+      expect(@sub_tree.path_with_prefix).to be == "<root>/a/b"
     end
 
     it "assign empty prefix path" do
       @tree.prefix_path= ""
 
-      @tree.prefix_path.should == "/"
-      @tree.path.should == "a"
-      @sub_tree.path.should == "a/b"
-      @tree.path_with_prefix.should == "/a"
-      @sub_tree.path_with_prefix.should == "/a/b"
+      expect(@tree.prefix_path).to be == "/"
+      expect(@tree.path).to be == "a"
+      expect(@sub_tree.path).to be == "a/b"
+      expect(@tree.path_with_prefix).to be == "/a"
+      expect(@sub_tree.path_with_prefix).to be == "/a/b"
     end
 
     it "assign prefix path wo a /" do
       @tree.prefix_path= "<root>"
 
-      @tree.prefix_path.should == "<root>/"
-      @tree.path_with_prefix.should == "<root>/a"
-      @sub_tree.path_with_prefix.should == "<root>/a/b"
+      expect(@tree.prefix_path).to be == "<root>/"
+      expect(@tree.path_with_prefix).to be == "<root>/a"
+      expect(@sub_tree.path_with_prefix).to be == "<root>/a/b"
     end
 
     it "invalidate" do
       @tree.prefix_path="root/"
-      @sub_tree.path.should == "a/b"
-      @sub_tree.path_with_prefix.should == "root/a/b"
-      @sub_tree.depth.should == 2
+      expect(@sub_tree.path).to be == "a/b"
+      expect(@sub_tree.path_with_prefix).to be == "root/a/b"
+      expect(@sub_tree.depth).to be == 2
 
       r = TreeNode.new("r")
       r.add_child(@tree)
-      @sub_tree.path.should == "r/a/b"
-      @sub_tree.path_with_prefix.should == "r/a/b"
+      expect(@sub_tree.path).to be == "r/a/b"
+      expect(@sub_tree.path_with_prefix).to be == "r/a/b"
 
       r.prefix_path="new_root/"
-      @sub_tree.path.should == "r/a/b"
-      @sub_tree.path_with_prefix.should == "new_root/r/a/b"
-      @sub_tree.depth.should == 3
+      expect(@sub_tree.path).to be == "r/a/b"
+      expect(@sub_tree.path_with_prefix).to be == "new_root/r/a/b"
+      expect(@sub_tree.depth).to be == 3
     end
 
   end

data/spec/tree_rb/core/tree_node_spec.rb

@@ -5,35 +5,35 @@ describe TreeNode do
 
   it "should initialize correctly" do
     ta = TreeNode.new("a")
-    ta.should be_root
+    expect(ta).to be_root
 
     ln1 = LeafNode.new("1", ta)
-    ln1.parent.should == ta
-    ln1.should_not be_root
+    expect(ln1.parent).to be == ta
+    expect(ln1).to_not be_root
 
     ln2 = LeafNode.new("2", ta)
     tb  = TreeNode.new("b", ta)
     ln3 = LeafNode.new("3", tb)
-    ln3.parent.should == tb
+    expect(ln3.parent).to be == tb
 
     # test depth
-    tb.depth.should == 2
-    ln3.depth.should == 3
+    expect(tb.depth).to be == 2
+    expect(ln3.depth).to be == 3
 
     # test nr_nodes
-    tb.nr_nodes.should == 1
-    ta.nr_nodes.should == 4
+    expect(tb.nr_nodes).to be == 1
+    expect(ta.nr_nodes).to be == 4
 
     # puts ta.to_str
   end
 
   it "should add child and leaf" do
     ta = TreeNode.new("a")
-    ta.should be_root
+    expect(ta).to be_root
 
     ln1 = LeafNode.new("1")
     ta.add_leaf(ln1)
-    ln1.parent.should == ta
+    expect(ln1.parent).to be == ta
 
     ln2 = LeafNode.new("2", ta)
     ta.add_leaf(ln2)
@@ -41,7 +41,7 @@ describe TreeNode do
     tb  = TreeNode.new("b", ta)
     ln3 = LeafNode.new("3", tb)
     tb.add_leaf(ln3)
-    ln3.parent.should == tb
+    expect(ln3.parent).to be == tb
 
     ta.add_child(tb)
     # puts ta.to_str
@@ -49,27 +49,27 @@ describe TreeNode do
 
   it "next and prev" do
     ta = TreeNode.new("a")
-    ta.prev.should be_nil
-    ta.next.should be_nil
+    expect(ta.prev).to be_nil
+    expect(ta.next).to be_nil
 
     ln1 = LeafNode.new("1", ta)
-    ln1.prev.should be_nil
-    ln1.next.should be_nil
+    expect(ln1.prev).to be_nil
+    expect(ln1.next).to be_nil
 
     ln2 = LeafNode.new("2", ta)
-    ln2.prev.should == ln1
-    ln2.next.should be_nil
+    expect(ln2.prev).to be == ln1
+    expect(ln2.next).to be_nil
 
     ln3 = LeafNode.new("3", ta)
-    ln2.next.should == ln3
+    expect(ln2.next).to be == ln3
 
     tb = TreeNode.new("b", ta)
-    tb.next.should be_nil
-    tb.prev.should be_nil
+    expect(tb.next).to be_nil
+    expect(tb.prev).to be_nil
 
     tc = TreeNode.new("c", ta)
-    tc.prev.should == tb
-    tc.next.should be_nil
+    expect(tc.prev).to be == tb
+    expect(tc.next).to be_nil
   end
 
   context "navigate tree" do
@@ -84,37 +84,37 @@ describe TreeNode do
     end
 
     it "nr_nodes and nr_leaves and nr_children" do
-      @tree.nr_nodes.should == 5
-      @tree.nr_leaves.should == 4
-      @tree.nr_children.should == 1
+      expect(@tree.nr_nodes).to be == 5
+      expect(@tree.nr_leaves).to be == 4
+      expect(@tree.nr_children).to be == 1
 
-      @sub_tree.nr_nodes.should == 2
-      @sub_tree.nr_leaves.should == 2
-      @sub_tree.nr_children.should == 0
+      expect(@sub_tree.nr_nodes).to be == 2
+      expect(@sub_tree.nr_leaves).to be == 2
+      expect(@sub_tree.nr_children).to be == 0
     end
 
 
     context "find" do
 
       it "find by string" do
-        @tree.find("a").should === @tree
-        @tree.find("b").should === @sub_tree
-        @tree.find("3").should === @ln3
-        @tree.find("not existent").should be_nil
+        expect(@tree.find("a")).to be === @tree
+        expect(@tree.find("b")).to be === @sub_tree
+        expect(@tree.find("3")).to be === @ln3
+        expect(@tree.find("not existent")).to be_nil
       end
 
       it "find by regex" do
-        @tree.find(/[a,b]/).should === @tree
-        @tree.find(/[b,c]/).should === @sub_tree
-        @tree.find(/\d\d/).should === @ln4
-        @tree.find(/not existent/).should be_nil
+        expect(@tree.find(/[a,b]/)).to be === @tree
+        expect(@tree.find(/[b,c]/)).to be === @sub_tree
+        expect(@tree.find(/\d\d/)).to be === @ln4
+        expect(@tree.find(/not existent/)).to be_nil
       end
 
       it "find with block" do
-        @tree.find { |e| e.content == "a" }.should === @tree
-        @tree.find { |e| e.content == "b" }.should === @sub_tree
-        @tree.find { |e| e.content == "3" }.should === @ln3
-        @tree.find { |e| e.content == "not existent" }.should be_nil
+        expect(@tree.find { |e| e.content == "a" }).to be === @tree
+        expect(@tree.find { |e| e.content == "b" }).to be === @sub_tree
+        expect(@tree.find { |e| e.content == "3" }).to be === @ln3
+        expect(@tree.find { |e| e.content == "not existent" }).to be_nil
       end
 
       it "to_str" do
@@ -126,7 +126,7 @@ a
     |-- 3
     `-- 12
 EOS
-        @tree.to_str.should == out
+        expect(@tree.to_str).to be == out
       end
 
     end

data/spec/tree_rb/core/tree_node_visitor_delegate_spec.rb

@@ -23,13 +23,13 @@ describe TreeNodeVisitor do
     visitor = TreeNodeVisitor.new(delegate)
 
     visitor.enter_node(nil)
-    delegate.instance_eval{ @entered_node }.should be_true
+    expect(delegate.instance_eval{ @entered_node }).to be true
 
     visitor.exit_node(nil)
-    delegate.instance_eval{ @exit_node }.should be_true
+    expect(delegate.instance_eval{ @exit_node }).to be true
 
     visitor.visit_leaf(nil)
-    delegate.instance_eval{ @visited_leaf }.should be_true
+    expect(delegate.instance_eval{ @visited_leaf }).to be true
   end
 
 end

data/spec/tree_rb/core/tree_node_visitor_dsl_spec.rb

@@ -20,16 +20,16 @@ describe TreeNodeVisitor do
     end
 
     visitor.enter_node(nil)
-    visitor.instance_eval{ @entered_node }.should be_true
+    expect(visitor.instance_eval{ @entered_node }).to be true
 
     visitor.exit_node(nil)
-    visitor.instance_eval{ @exit_node }.should be_true
+    expect(visitor.instance_eval{ @exit_node }).to be true
 
     visitor.visit_leaf(nil)
-    visitor.instance_eval{ @visit_leaf }.should be_true
+    expect(visitor.instance_eval{ @visit_leaf }).to be true
   end
 
-  it "should initialize correctly" do
+  it 'should initialize correctly' do
     visitor = TreeNodeVisitor.new do
 
       on_enter_node do |node, parent|
@@ -50,17 +50,17 @@ describe TreeNodeVisitor do
 
     visitor.instance_eval{ @stack = ["p"] }
     visitor.enter_node("n")
-    visitor.instance_eval{ @node }.should == "n"
-    visitor.instance_eval{ @parent }.should == "p"
-    visitor.instance_eval{ @stack }.should have(2).node
+    expect(visitor.instance_eval{ @node }).to be == "n"
+    expect(visitor.instance_eval{ @parent }).to be == "p"
+    expect(visitor.instance_eval{ @stack }).to have(2).node
 
     visitor.exit_node("n")
-    visitor.instance_eval{ @node }.should == "n"
-    visitor.instance_eval{ @stack }.should have(1).node
+    expect(visitor.instance_eval{ @node }).to be == "n"
+    expect(visitor.instance_eval{ @stack }).to have(1).node
 
-    visitor.instance_eval{ @stack = ["p"] }
-    visitor.visit_leaf("l")
-    visitor.instance_eval{ @leaf }.should == "l"
-    visitor.instance_eval{ @parent }.should == "p"
+    visitor.instance_eval{ @stack = ['p'] }
+    visitor.visit_leaf('l')
+    expect(visitor.instance_eval{ @leaf }).to be == 'l'
+    expect(visitor.instance_eval{ @parent }).to be == 'p'
   end
 end

data/spec/tree_rb/extension_digest_spec.rb

@@ -1,19 +1,18 @@
 # -*- coding: utf-8 -*-
-require File.expand_path( File.join(File.dirname(__FILE__), "..", "spec_helper") )
+require File.expand_path( File.join(File.dirname(__FILE__), '..', 'spec_helper') )
 
-describe "MD5" do
+describe 'MD5' do
 
   before do
     @file_name = File.expand_path( File.join( File.dirname(__FILE__), "..", "..", "lib", "tree_rb", "extension_digest.rb" ) )
   end
 
-
-  it "should calculate md5" do
-    MD5.file( @file_name ).to_s.should  ==  "b33c6b70109037fc02686f8babfc2db4"
+  it 'should calculate md5' do
+    expect(MD5.file( @file_name ).to_s).to be == 'b33c6b70109037fc02686f8babfc2db4'
   end
 
-  it "should calculate sha1" do
-    SHA1.file( @file_name ).to_s.should  ==  "f99700dbdd200d7255f586ceb0cac05e05871cc5"
+  it 'should calculate sha1' do
+    expect(SHA1.file( @file_name ).to_s).to be == 'f99700dbdd200d7255f586ceb0cac05e05871cc5'
   end
 
 end

data/spec/tree_rb/extension_numeric_spec.rb

@@ -5,9 +5,9 @@ require File.expand_path( File.join(File.dirname(__FILE__), "..", "spec_helper")
 describe "TCNumeric" do
 
   it "test_simple" do
-    10.with_separator.should == "10"
-    10.0.with_separator.should == "10.0"
-    1000000.with_separator.should == "1,000,000"
+    expect(10.with_separator).to be == "10"
+    expect(10.0.with_separator).to be == "10.0"
+    expect(1000000.with_separator).to be == "1,000,000"
   end
 
 end

data/spec/tree_rb/input_file_system/dir_processor_spec.rb

@@ -8,8 +8,8 @@ describe DirProcessor do
     dp    = DirProcessor.new { |f| files << f }
     dp.process(FIXTURES)
 
-    puts files
-    files.length.should == 5
+    # puts files
+    expect(files.length).to be == 8
   end
 
 end

data/spec/tree_rb/input_file_system/directory_walker_conf_spec.rb

@@ -1,59 +1,59 @@
-# -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
-
-describe DirTreeWalker do
-
-  it 'should accept option :ignore with regex' do
-    walker = DirTreeWalker.new :ignore => /^\./
-    walker.ignore_file?('.thumbnails').should be_true
-    walker.ignore_dir?('.thumbnails').should be_true
-  end
-
-  it 'should accept option :ignore with string' do
-    walker = DirTreeWalker.new :ignore => '.git'
-    walker.ignore_file?('.git').should be_true
-    walker.ignore_dir?('.git').should be_true
-  end
-
-  it 'should accept option :ignore_dir' do
-    dtw = DirTreeWalker.new :ignore_dir => [/^\./, "private_dir" ]
-    dtw.should be_ignore_dir '.git'
-    dtw.should be_ignore_dir 'private_dir'
-  end
-
-  it 'should accept option :ignore_file' do
-    dtw = DirTreeWalker.new :ignore_file => [/.xml/, /(ignore)|(orig)/ ]
-    dtw.should be_ignore_file 'pippo.xml'
-  end
-
-  it 'should accept option :match with string' do
-    dtw = DirTreeWalker.new :match => '.jpg'
-    dtw.should be_match 'foo.jpg'
-  end
-
-  it 'should accept option :match with regex' do
-    dtw = DirTreeWalker.new :match => /.jpg/
-    dtw.should be_match 'foo.jpg'
-  end
-
-  it 'should ignore files and directory' do
-    walker = DirTreeWalker.new('.')
-
-    walker.ignore(/^\./)
-    walker.ignore_file?('.thumbnails').should be_true
-    walker.ignore_dir?('.thumbnails').should be_true
-
-    walker.ignore_dir('thumbnails')
-    walker.ignore_dir?('.thumbnails').should be_true
-    walker.ignore_dir?('thumbnails').should be_true
-    walker.ignore_dir?('pippo').should be_false
-
-    walker.ignore_file('xvpics')
-    walker.ignore_file?('xvpics').should be_true
-
-    walker.ignore('sub')
-    walker.ignore_file?('[Dsube]').should be_false
-    walker.ignore_dir?('[Dsube]').should be_false
-  end
-
-end
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe DirTreeWalker do
+
+  it 'should accept option :ignore with regex' do
+    walker = DirTreeWalker.new :ignore => /^\./
+    expect(walker.ignore_file?('.thumbnails')).to be true
+    expect(walker.ignore_dir?('.thumbnails')).to be true
+  end
+
+  it 'should accept option :ignore with string' do
+    walker = DirTreeWalker.new :ignore => '.git'
+    expect(walker.ignore_file?('.git')).to be true
+    expect(walker.ignore_dir?('.git')).to be true
+  end
+
+  it 'should accept option :ignore_dir' do
+    dtw = DirTreeWalker.new :ignore_dir => [/^\./, "private_dir" ]
+    expect(dtw.ignore_dir?('.git')).to be true
+    expect(dtw.ignore_dir?('private_dir')).to be true
+  end
+
+  it 'should accept option :ignore_file' do
+    dtw = DirTreeWalker.new :ignore_file => [/.xml/, /(ignore)|(orig)/ ]
+    expect(dtw).to be_ignore_file('pippo.xml')
+  end
+
+  it 'should accept option :match with string' do
+    dtw = DirTreeWalker.new :match => '.jpg'
+    expect(dtw).to be_match('foo.jpg')
+  end
+
+  it 'should accept option :match with regex' do
+    dtw = DirTreeWalker.new :match => /.jpg/
+    expect(dtw).to be_match('foo.jpg')
+  end
+
+  it 'should ignore files and directory' do
+    walker = DirTreeWalker.new('.')
+
+    walker.ignore(/^\./)
+    expect(walker.ignore_file?('.thumbnails')).to be true
+    expect(walker.ignore_dir?('.thumbnails')).to be true
+
+    walker.ignore_dir('thumbnails')
+    expect(walker.ignore_dir?('.thumbnails')).to be true
+    expect(walker.ignore_dir?('thumbnails')).to be true
+    expect(walker.ignore_dir?('pippo')).to be false
+
+    walker.ignore_file('xvpics')
+    expect(walker.ignore_file?('xvpics')).to be true
+
+    walker.ignore('sub')
+    expect(walker.ignore_file?('[Dsube]')).to be false
+    expect(walker.ignore_dir?('[Dsube]')).to be false
+  end
+
+end