gitgit 0.0.1 → 0.0.2

data/lib/gitgit/version.rb

@@ -1,3 +1,3 @@
 module Gitgit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/gitgit.rb

@@ -9,17 +9,34 @@ module Gitgit
 
     desc "init", "Initialise a git repo"
     def init
+      return unless yes? "You're in the folder #{Dir.pwd}. Are you sure you want to make it into a git repository? (y/n)"
       Git.init
       say "Git repo created! Let's git going ...", :green
     end
 
     desc "save", "Save you changes to the repo"
     def save
-      yes? "Do you really want to save?"
+      g = get_git_repo || return
+
+      say "You're about to save the following changes:"
+      say ""
+      show_status(g)
+
+      return unless yes? "Do you want to save these changes to git? (y/n)"
       m = ask "Give a short description of the work you're saving: "
-      g = Git.open('.')
       g.add(all:true)
       g.commit(m)
+      say "Changes saved! :)", :green
+    end
+
+    desc "status", "See what changes you've made since you last save"
+    def status
+      g = get_git_repo || return
+      say "The following changes have occurred since your last save:"
+      show_status(g)
+      say ""
+      say "Type 'gitgit save' to save your work!"
+      say ""
     end
 
     desc "lg", "Show your recent saves"
@@ -28,5 +45,62 @@ module Gitgit
       g.log(20).each {|l| puts l }
     end
 
+    desc "push", "Push your changes to github"
+    def push
+      g = get_git_repo || return
+
+      if g.remotes.empty?
+        say "Can't push as this repository has no remotes!", :red
+        say ""
+        say "You need to set up a repository on github and follow the instructions to connect it to this folder on your laptop."
+        return
+      end
+
+      g.push
+      say "Work successfully pushed to github!", :green
+
+    rescue Git::GitExecuteError
+      say "There was a problem pushing your work to github. :(", :red
+    end
+
+    no_commands do
+      def show_status(g)
+        say ""
+        say "New files:"
+        new_files = g.status.added.merge(g.status.untracked)
+        new_files.each do |k, v|
+          say "     #{k}", :green
+        end
+        say "     none" if new_files.length == 0
+        say ""
+        say "Changed files:"
+        g.status.changed.each do |k, v|
+          say "     #{k}", :yellow
+        end
+        say "     none" if g.status.changed.length == 0
+        say ""
+        say "Deleted files:"
+        g.status.deleted.each do |k, v|
+          say "     #{k}", :red
+        end
+        say "     none" if g.status.deleted.length == 0
+      end
+
+      def get_git_repo
+        Git.open('.')
+      rescue ArgumentError
+        say "This folder isn't git enabled. Check you're in the right folder!", :red
+        say ""
+        say "You're currently in the folder #{Dir.pwd}."
+        say ""
+        say "If this is the right folder you need to create a repository first:"
+        say ""
+        say "      gitgit init"
+        say ""
+        say "If not, use cd to move to the right folder."
+        false
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitgit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor