sundae 1.0.2 → 1.0.3

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.
data/CHANGELOG CHANGED
@@ -1,3 +1,21 @@
1
+ === 1.0.3 / 2012-04-13
2
+
3
+ * bug fixes for 1.8.*:
4
+ * monkeypatched a Dir.home method
5
+ * fixed variable that was shadowed in 1.9, overwritten in 1.8
6
+
7
+ === 1.0.2 / 2012-02-28
8
+
9
+ * minor enhancements:
10
+ * change default location for "dot-" mnt directories
11
+ * better documentation
12
+
13
+ === 1.0.1 / 2012-02-27
14
+
15
+ * minor enhancements:
16
+ * can place files directly in static directories now
17
+ * cleaned up code
18
+
1
19
  === 1.0.0 / 2012-02-21
2
20
 
3
21
  * Backwards incompatible: use Ruby for config file (not YAML)
data/lib/sundae.rb CHANGED
@@ -4,6 +4,14 @@ require 'fileutils'
4
4
  require 'find'
5
5
  require 'pathname'
6
6
 
7
+ unless Dir.respond_to?(:home)
8
+ class Dir
9
+ def self.home
10
+ File.expand_path('~')
11
+ end
12
+ end
13
+ end
14
+
7
15
  # A collection of methods to mix the contents of several directories
8
16
  # together using symbolic links.
9
17
  #
@@ -126,9 +134,11 @@ module Sundae
126
134
  Pathname.new(path).expand_path
127
135
  mnts = []
128
136
  collections = path.children(false).delete_if {|c| c.to_s =~ /^\./}
137
+
129
138
  collections.each do |c|
130
- collection_mnts = (path + c).children(false).delete_if {|c| c.to_s =~ /^\./}
139
+ collection_mnts = (path + c).children(false).delete_if {|kid| kid.to_s =~ /^\./}
131
140
  collection_mnts.map! { |mnt| (c + mnt) }
141
+
132
142
  mnts |= collection_mnts # |= is the union
133
143
  end
134
144
 
data/test/test_sundae.rb CHANGED
@@ -20,7 +20,7 @@ class TestSundae < Test::Unit::TestCase
20
20
  %w(c1 c2 c1/d1 c1/d2 c2/d1 c2/d3 c2/d3/d31).each do |x|
21
21
  (@@mnts_dir + x).mkpath
22
22
  end
23
-
23
+
24
24
  %w(c1/d1/f11 c1/d1/f12 c1/d2/f21 c2/d1/f13 c2/d1/f14 c2/d3/f31).each do |x|
25
25
  (@@mnts_dir + x).open('w')
26
26
  end
data/version.txt CHANGED
@@ -1 +1 @@
1
- 1.0.2
1
+ 1.0.3
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sundae
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.2
4
+ version: 1.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-28 00:00:00.000000000 Z
12
+ date: 2012-04-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: highline
16
- requirement: &79306580 !ruby/object:Gem::Requirement
16
+ requirement: &73668090 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.6.11
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *79306580
24
+ version_requirements: *73668090
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: configatron
27
- requirement: &79306020 !ruby/object:Gem::Requirement
27
+ requirement: &73667370 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.9.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *79306020
35
+ version_requirements: *73667370
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &79305190 !ruby/object:Gem::Requirement
38
+ requirement: &73661960 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.12'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *79305190
46
+ version_requirements: *73661960
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bones
49
- requirement: &79303240 !ruby/object:Gem::Requirement
49
+ requirement: &73658740 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: 3.7.3
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *79303240
57
+ version_requirements: *73658740
58
58
  description: Mix collections of files while maintaining complete separation.
59
59
  email: don@ohspite.net
60
60
  executables:
@@ -83,10 +83,6 @@ files:
83
83
  bGliL3N1bmRhZS5yYg==
84
84
  - !binary |-
85
85
  dGVzdC90ZXN0X3N1bmRhZS5yYg==
86
- - !binary |-
87
- dW5pc29uL2NvbW1vbg==
88
- - !binary |-
89
- dW5pc29uL210X2V4YW1wbGUucHJm
90
86
  - !binary |-
91
87
  dmVyc2lvbi50eHQ=
92
88
  homepage: https://github.com/ohspite/sundae
data/unison/common DELETED
@@ -1,17 +0,0 @@
1
- fastcheck = true
2
-
3
- # Roots of the synchronization
4
- include local_mnt_path
5
-
6
- ui = text
7
- log = false
8
- auto = true
9
-
10
- # Names and paths to ignore:
11
- ignore = Name temp.*
12
- ignore = Name *~
13
- ignore = Name .*~
14
- ignore = Name *.o
15
- ignore = Name *.tmp
16
- ignore = Name .emacs_autosaves
17
- ignore = Name .emacs_backups
@@ -1,12 +0,0 @@
1
- include common
2
-
3
- root = ssh://donmarch.org//home/14129/users/don%donmarch.org/var/unison/mnts
4
- sshargs = "-l don%donmarch.org"
5
-
6
- path = linux
7
- path = nix
8
- path = personal
9
- path = personal_private
10
- path = proprietorship
11
- path = personal_archive
12
- path = reference