crawling 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c676252580faee11ade942d854c86856e8d56d9
-  data.tar.gz: fe0a7ccdc9832846bf10135387afe4833caf2249
+  metadata.gz: 16535e151189a5b08dd80f2ee96eb80c773c4c89
+  data.tar.gz: 546fb69bf2ce963cf18f151bd3d1a10888e93b2f
 SHA512:
-  metadata.gz: 25fee50290c16e846560c1f3af35e84bcff00433006a89db6db0699c533608a1f4f0786b1568ba45d1086e5a9907f98ee05cda26fd0fc339b56d3920d5e67cb6
-  data.tar.gz: d0e93a41ba6fc3e19cfebd59251467ccfc670d763fd02458e8fb7cb81286815583f7cfca43fbe5095c1cb2411ecead982bd06e68225bbc592b56cff6ae93b10f
+  metadata.gz: a5012d5fdc91a4d57a648267651cf8d5f7c3f53db251207ed1539f227be611e293e35adec77cf1c3b04ee1dc3329e65bdd8b074953366ba67e6fec05952360ec
+  data.tar.gz: f95a2b676c9c37f872ea452cda34e665e84a9b39fc7aec3d00582a9da5996dafff4cc64b09e115b462f9b2c9c684873fd71ec33ee2abd2f72a5c4c721688f891

data/README.md

@@ -2,23 +2,14 @@
 
 [![build status](https://circleci.com/gh/ohjames/crawling.png)](https://circleci.com/gh/ohjames/crawling)
 
-Welcome to crawling, documentation coming soon!
+Welcome to crawling, documentation coming soon, for now see `crawling -h`.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'crawling'
+Install ruby and gem then:
+```
+gem install crawling
 ```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install crawling
 
 ## Usage
 

data/lib/crawling/version.rb

@@ -1,3 +1,3 @@
 module Crawling
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/crawling.rb

@@ -107,25 +107,25 @@ module Crawling
         end
 
         while (diff_string = get_diff storage_file, file) != ''
-          print "#{file}: show [d]iff, [m]erge, take [h]ome, take [S]tore, skip [n]ext? "
+          print "#{file}: [a]dd to store, [g]et from store, [d]iff, [m]erge, [s]kip? "
           answer = STDIN.gets.chomp
           case answer
+          when 'a'
+            Crawling.copy_file file, storage_file
+            break
+          when 'g'
+            Crawling.copy_file storage_file, file
+            break
           when 'd'
             puts diff_string
             puts
             redo
-          when 'h'
-            Crawling.copy_file file, storage_file
-            break
           when 'm'
             system *@merge_app.sub('%s', storage_file).sub('%h', file).split(' ')
-          when 'n'
-            break
-          when 'S'
-            Crawling.copy_file storage_file, file
+          when 's'
             break
           else
-            puts 'please answer with d, h, m, n or S'
+            puts 'please answer with a, d, g, m, or s'
             redo
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crawling
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Pike