vman 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +25 -2
  3. data/lib/vman/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 65c9ed8c0ea649bf2e5860e42891de530d243d53
4
- data.tar.gz: f00e98ad6611192c42eedeaeb05cdcef74c66642
3
+ metadata.gz: 7bd6be49eec13694f563fe1ee9af9d23adb631ae
4
+ data.tar.gz: 54cf4d2bab13b7fbe91d3fa6265e9a11a2dee987
5
5
  SHA512:
6
- metadata.gz: c325cbbbc947a7b7187f74f8b07b18eff008a92d1d5397f6721427bf51c0c6cbd9f21512f22c0d527dfd05225f5ffd88cd8531fc6c3f466a0e1d1d77b2ec9015
7
- data.tar.gz: 489b35692691e3a7296f7ebba2b9dbdc0ba9ca9d45eb765d1904e00c3a313535f8951142fdda1bbbfa0865721e5b3f421aae3252a4f2e405b3ace79b9e59c8e4
6
+ metadata.gz: 418b9112e982ef7676a728665227de1060f57eb1915a1dc57f77d2dde2908dbcdd454776a5d03861b5f550ac157bf12329356c92e3c2f5a70eef7916148a044e
7
+ data.tar.gz: a48f9d269e61b2e72453274dcb96c4b7a71455fafbd7d5945fa525818a68df15094d7bbd6c9c7557a0a684e647b5ffc312bc4b0d02764df0a0a99f0aa0234058
data/README.md CHANGED
@@ -1,5 +1,7 @@
1
1
  # Vman
2
2
 
3
+ [![Gem Version](https://badge.fury.io/rb/vman.svg)](https://badge.fury.io/rb/vman)
4
+
3
5
  Like superman but not at all.
4
6
 
5
7
  A ruby gem to help manage (push/pull/delete/promote/etc) your objects and
@@ -88,7 +90,7 @@ You can easily hook into the git workflow with Vman by doing the following:
88
90
 
89
91
  exec < /dev/tty
90
92
 
91
- cd ./path/to/synced/direcotry
93
+ cd ./path/to/synced/directory
92
94
 
93
95
  vman push
94
96
 
@@ -101,12 +103,33 @@ while true; do
101
103
  esac
102
104
  done
103
105
 
104
- printf "Continuing with 'git push'...\n"
106
+ printf "Continuing with git operation...\n"
105
107
  ```
106
108
 
107
109
  This will first do a dry-run of `vman push` and show you the files that it plans to push to your S3 bucket. It will then prompt for
108
110
  confirmation to execute the push. Regardless of your selection, your normal git flow will not be interrupted.
109
111
 
112
+ For hooking into git pulls/merge, add a similar git hook under `.git/hooks/post-merge`. For example:
113
+ ```bash
114
+ #!/bin/bash
115
+
116
+ exec < /dev/tty
117
+
118
+ cd ./path/to/synced/directory
119
+
120
+ vman pull
121
+
122
+ while true; do
123
+ read -p "Do you wish to pull these files from S3?" yn
124
+ case $yn in
125
+ [Yy]* ) vman pull -f; break;;
126
+ [Nn]* ) printf "Nothing pulled from S3.\n\n"; exit;;
127
+ * ) echo "Please answer yes or no.";;
128
+ esac
129
+ done
130
+ ```
131
+ The `post-merge` hook is called after a merge. Because of this, it cannot abort a merge.
132
+
110
133
  **N.B.** githooks execute in the root of your repo directory. Keep this in mind when entering the path to the (sub)directory
111
134
  you wish to sync.
112
135
 
data/lib/vman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Vman
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vman
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - strong-code
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-27 00:00:00.000000000 Z
11
+ date: 2016-09-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk