waggit 0.0.004 → 0.0.005
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.
- checksums.yaml +8 -8
- data/lib/waggit.rb +38 -32
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
YmE2ZGYzYmU3YWFlYTFhNWFlZjIzNGFiYWJmOTgzOGU1ZmQ3NTU3YQ==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
YjFkNWUyMDgyMjUzZTY4MmUzOGMwY2EzNDQwZWE2YjkxMmE0ZWYwMQ==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
NzUxYWJhY2FjYjY1NzVhZTEzZjdiNTk0NWRlNDU3MTA4NGRmMTg5MTQ2NjI3
|
|
10
|
+
OTU1YjZkZWVmYTE5MGJjY2EyNTliNDMzNGRlY2I2ZjgwMTBmZDIwODEyYzQw
|
|
11
|
+
YjllN2MxMzAxM2EyNjIzMzI2MTA4NzY2NTAyZDAyMjYxNzNkMTQ=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
MDM0NDIzN2QzOTI2MTRhYzMzZTRiYjlkNDA0MWM0MzMzMmYxODJmZTJlMWVi
|
|
14
|
+
MGQwY2JjY2U4NGI0OTcwYTZiZTY1Y2RmZmU3YjBjMjhiZGQzODgwMTVmYTJh
|
|
15
|
+
NTJkODA2MjFhNjgzNGJhNzkxNDgzNGZhM2VlYzk3NzIwYjk2NzU=
|
data/lib/waggit.rb
CHANGED
|
@@ -37,44 +37,50 @@ class Waggit
|
|
|
37
37
|
end
|
|
38
38
|
|
|
39
39
|
def self.sync(options)
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
begin
|
|
41
|
+
puts Git.checkout_master
|
|
42
|
+
puts Git.delete_wagon
|
|
43
|
+
puts Git.delete_local
|
|
44
|
+
puts Git.stash
|
|
44
45
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
puts Git.checkout_master
|
|
54
|
-
puts Git.rebase_wagon
|
|
55
|
-
puts Git.checkout_master
|
|
56
|
-
puts Git.merge_wagon
|
|
46
|
+
puts Git.checkout_new_wagon
|
|
47
|
+
puts Wagon.pull(options)
|
|
48
|
+
#TODO: Checkout: http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
|
|
49
|
+
if Git.has_changes?
|
|
50
|
+
puts Git.add_all
|
|
51
|
+
puts Git.commit "merge wagon pull"
|
|
52
|
+
end
|
|
57
53
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
puts Git.rebase_local
|
|
63
|
-
puts Git.checkout_master
|
|
64
|
-
puts Git.merge_local
|
|
65
|
-
puts Git.delete_wagon
|
|
66
|
-
puts Git.delete_local
|
|
54
|
+
puts Git.checkout_master
|
|
55
|
+
puts Git.rebase_wagon
|
|
56
|
+
puts Git.checkout_master
|
|
57
|
+
puts Git.merge_wagon
|
|
67
58
|
|
|
68
|
-
|
|
69
|
-
|
|
59
|
+
puts Git.checkout_new_local
|
|
60
|
+
puts Git.stash_pop
|
|
70
61
|
puts Git.add_all
|
|
71
|
-
puts Git.
|
|
72
|
-
|
|
62
|
+
puts Git.commit_prompt
|
|
63
|
+
puts Git.rebase_local
|
|
64
|
+
puts Git.checkout_master
|
|
65
|
+
puts Git.merge_local
|
|
66
|
+
puts Git.delete_wagon
|
|
67
|
+
puts Git.delete_local
|
|
73
68
|
|
|
74
|
-
|
|
75
|
-
|
|
69
|
+
Files.clean_css
|
|
70
|
+
if Git.has_changes?
|
|
71
|
+
puts Git.add_all
|
|
72
|
+
puts Git.commit "cleaned css"
|
|
73
|
+
end
|
|
76
74
|
|
|
77
|
-
|
|
75
|
+
puts Git.pull
|
|
76
|
+
puts Git.push
|
|
77
|
+
|
|
78
|
+
puts Wagon.push(options)
|
|
79
|
+
rescue Exception
|
|
80
|
+
puts "Sync aborted, switching back to master branch"
|
|
81
|
+
puts Git.checkout_master
|
|
82
|
+
raise
|
|
83
|
+
end
|
|
78
84
|
end
|
|
79
85
|
|
|
80
86
|
end
|