RubyGems - rscm - Versions diffs - 0.1.0.1337 → 0.1.0.1338 - Mend

rscm 0.1.0.1337 → 0.1.0.1338

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

data/Rakefile CHANGED

@@ -56,6 +56,7 @@ end
 PKG_FILES = FileList[
   '[A-Z]*',
   'lib/**/*',
+  'bin/**/*',
   'test/**/*',
   'testproject/**/*',
   'doc/**/*',

data/bin/Diff_StdDisclaimer.html ADDED

@@ -0,0 +1,24 @@
+<html>
+<head>
+<meta name="GENERATOR" content="Microsoft FrontPage 3.0">
+<title>Disclaimer</title>
+</head>
+<body bgcolor="#FD8698">
+<h2 align="center">Disclaimer (from <a href="http://unxutils.sourceforge.net/">http://unxutils.sourceforge.net/</a>)</h2>
+<p align="left">THIS SOFTWARE IS PROVIDED &quot;AS IS&quot; AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE&nbsp; CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)<br>
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+<p><a href="mailto:syring@web.de"><font face="Trebuchet MS">Karl M. Syring</font></a></p>
+</body>
+</html>

data/bin/diff.exe ADDED

Binary file

data/lib/rscm/attr_attr.rb ADDED

@@ -0,0 +1,36 @@
+class Class
+  # Defines a description "meta attribute" on the class for the next
+  # attr_reader or attr_accessor. Example:
+  #
+  #   TODO: take from test case
+  #
+  def desc(s, suffix=nil)
+    $attr_desc = s
+  end
+  alias old_attr_reader attr_reader
+  def attr_reader(*syms) #:nodoc:
+    syms.each do |sym|
+      class_eval <<-EOS
+        @@#{sym.id2name}_desc = $attr_desc
+        def self.#{sym.id2name}_desc
+          @@#{sym}_desc
+        end
+        def #{sym.id2name}_desc
+          @@#{sym}_desc
+        end
+      EOS
+    end
+    $attr_desc = nil
+    old_attr_reader(*syms)
+  end
+  def attr_accessor(*syms) #:nodoc:
+    attr_reader(*syms)
+    attr_writer(*syms)
+  end
+end

data/lib/rscm/cvs/cvs.rb CHANGED

@@ -7,7 +7,7 @@ module RSCM
   # RSCM implementation for CVS.
   #
-  # You need the cvs executable on the PATH in order for it to work.
+  # You need a cvs executable on the PATH in order for it to work.
   #
   # NOTE: On Cygwin this has to be the win32 build of cvs and not the Cygwin one.
   class CVS < AbstractSCM
@@ -91,11 +91,7 @@ module RSCM
     def changesets(checkout_dir, from_identifier, to_identifier=Time.infinity, files=nil)
       checkout(checkout_dir) unless uptodate?(checkout_dir, nil) # must checkout to get changesets
-      begin
-        parse_log(checkout_dir, new_changes_command(from_identifier, to_identifier, files))
-      rescue => e
-        parse_log(checkout_dir, old_changes_command(from_identifier, to_identifier, files))
-      end
+      parse_log(checkout_dir, changes_command(from_identifier, to_identifier, files))
     end
     def diff(checkout_dir, change)
@@ -105,7 +101,7 @@ module RSCM
           when /#{Change::DELETED}/; "#{revision_option(change.previous_revision)}"
           when /#{Change::ADDED}/; "#{revision_option(Time.epoch)} #{revision_option(change.revision)}"
         end
-        # IPORTANT! CVS NT has a bug in the -N diff option
+        # IMPORTANT! CVS NT has a bug in the -N diff option
         # http://www.cvsnt.org/pipermail/cvsnt-bugs/2004-November/000786.html
         cmd = command_line("diff -Nu #{opts} #{change.path}")
         safer_popen(cmd, "r", 1) do |io|
@@ -239,11 +235,10 @@ module RSCM
       changesets
     end
-    def new_changes_command(from_identifier, to_identifier, files)
+    def changes_command(from_identifier, to_identifier, files)
       # https://www.cvshome.org/docs/manual/cvs-1.11.17/cvs_16.html#SEC144
       # -N => Suppress the header if no revisions are selected.
-      # -S => Do not print the list of tags for this file.
-      "log #{branch_option} -N -S #{period_option(from_identifier, to_identifier)}"
+      "log #{branch_option} -N #{period_option(from_identifier, to_identifier)}"
     end
     def branch_specified?
@@ -262,11 +257,6 @@ module RSCM
       "checkout #{branch_option} -d #{target_dir} #{mod} #{revision_option(to_identifier)}"
     end
-    def old_changes_command(from_identifier, to_identifier, files)
-      # Many servers don't support the new -S option
-      "log #{branch_option} -N #{period_option(from_identifier, to_identifier)}"
-    end
     def hidden_password
       if(password && password != "")
         "********"
@@ -354,10 +344,4 @@ module RSCM
       end
     end
   end
-  # Convenience factory method used in testing
-  def CVS.local(cvsroot_dir, mod)
-    cvsroot_dir = PathConverter.filepath_to_nativepath(cvsroot_dir, true)
-    CVS.new(":local:#{cvsroot_dir}", mod)
-  end
 end

data/test/rscm/attr_attr_test.rb ADDED

@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'rscm/attr_attr'
+module RSCM
+  class Whatever
+    desc "huba luba"
+    attr_accessor :foo
+    attr_accessor :ping
+    desc "bang bang"
+    attr_accessor :bar, :zap
+  end
+  class AttrAttrTest < Test::Unit::TestCase
+    def test_should_allow_attr_attr_description
+      assert_equal("huba luba", Whatever.foo_desc)
+      assert_nil(Whatever.ping_desc)
+      assert_equal("bang bang", Whatever.bar_desc)
+      assert_equal("bang bang", Whatever.zap_desc)
+    end
+    def TODOtest_should_allow_attr_value_attr_description
+      whatever = Whatever.new
+      assert_equal("huba luba", whatever.foo._desc)
+      assert_nil(whatever.ping._desc)
+      assert_equal("bang bang", whatever.bar._desc)
+      assert_equal("bang bang", whatever.zap._desc)
+    end
+  end
+end

data/test/rscm/cvs/cvs_test.rb CHANGED

@@ -1,8 +1,18 @@
 require 'test/unit'
+require 'rscm/path_converter'
 require 'rscm/cvs/cvs'
 require 'rscm/generic_scm_tests'
 module RSCM
+  class CVS
+    # Convenience factory method used in testing
+    def CVS.local(cvsroot_dir, mod)
+      cvsroot_dir = PathConverter.filepath_to_nativepath(cvsroot_dir, true)
+      CVS.new(":local:#{cvsroot_dir}", mod)
+    end
+  end
   class CVSTest < Test::Unit::TestCase
     include GenericSCMTests

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1337
-date: 2005-02-20
+  version: 0.1.0.1338
+date: 2005-02-24
 summary: "RSCM - Ruby Source Control Management"
 require_paths:
   - lib
@@ -35,6 +35,7 @@ files:
   - lib/rubyforge_file_publisher.rb
   - lib/rscm/abstract_log_parser.rb
   - lib/rscm/abstract_scm.rb
+  - lib/rscm/attr_attr.rb
   - lib/rscm/changes.rb
   - lib/rscm/cvs
   - lib/rscm/darcs
@@ -59,10 +60,13 @@ files:
   - lib/rscm/starteam/starteam.rb
   - lib/rscm/svn/svn.rb
   - lib/rscm/svn/svn_log_parser.rb
+  - bin/diff.exe
+  - bin/Diff_StdDisclaimer.html
   - test/actual
   - test/expected
   - test/rscm
   - test/rscm/apply_label_scm_tests.rb
+  - test/rscm/attr_attr_test.rb
   - test/rscm/changes_fixture.rb
   - test/rscm/changes_test.rb
   - test/rscm/changesets.yaml