version50 0.0.1 → 0.0.2

data/bin/{version50 → v50}

@@ -5,7 +5,7 @@ require 'version50'
 
 # display help if no options are given
 if ARGV.length == 0
-    Version50.new :action => 'help'
+    Version50.new 'help'
     exit
 end
 
@@ -15,6 +15,5 @@ trap('INT') {
     exit
 }
 
-# pass action to version50 handler
-action = ARGV[0]
-version50 = Version50.new :action => action
+# forward actions to version50
+version50 = Version50.new(ARGV[0], ARGV[1..-1])

data/lib/version50/git.rb

@@ -1,11 +1,24 @@
-require 'fileutils'
-require 'tmpdir'
-
 require 'version50/scm'
 
 class Git < SCM
+    # create a branch
+    def branch b
+        `git branch #{b}`
+    end
+
+    # checkout a branch
+    def checkout b
+        super
+        `git checkout #{b}`
+    end
+
+    # clone a repository
+    def download(url, path = '')
+        `git clone #{url} #{path} > /dev/null 2> /dev/null`
+    end
+
     # commit a new version without pushing
-    def commit
+    def commit(options = {})
         # prompt for commit message
         message = super
 
@@ -30,7 +43,7 @@ class Git < SCM
     # create a new repo
     def init
         `git init`
-        `echo ".version50" > .gitignore`
+        `echo ".version50\n.version50-warps" > .gitignore`
     end
 
     # view the project history
@@ -56,7 +69,16 @@ class Git < SCM
         return commits
     end
 
+    # return to the present
+    def present
+        `git reset --hard`
+        `git checkout master > /dev/null 2> /dev/null`
+    end
+
     def pull
+        # save before doing anything
+        self.save({ :quiet => true })
+        `git pull --rebase`
     end
 
     # push existing commits
@@ -64,6 +86,11 @@ class Git < SCM
         `git push -u origin master > /dev/null 2>&1`
     end
 
+    # reset all changes since last commit
+    def reset
+        `git reset --hard`
+    end
+
     # view changed files
     def status
         # get status from SCM
@@ -118,27 +145,11 @@ class Git < SCM
     end
 
     # warp to a specific version
-    def warp
-        # save current state before doing anything
-        revision = super
-
-        # determine project root and warp destination
-        path = @version50.root
-        dest = "version50-#{revision[:revision]}"
-
-        # create temporary directory to clone project into
-        Dir.mktmpdir do |d|
-            # clone project into temporary directory and revert to given revision
-            Dir.chdir(File.expand_path d)
-            `git clone #{path} . > /dev/null 2> /dev/null`
+    def warp r = nil
+        # save current state and determine revision to warp to
+        revision = super r
+        if revision
             `git checkout #{revision[:id]} -f > /dev/null 2> /dev/null`
-
-            # switch back to project root and create folder for warp
-            Dir.chdir(File.expand_path path)
-            FileUtils.mkdir dest
-
-            # move all files in temporary directory into warp directory
-            FileUtils.mv(Dir.glob(File.expand_path(d) + '/*'), dest)
         end
     end
 end

data/lib/version50/scm.rb

@@ -1,16 +1,35 @@
 require 'pathname'
+require 'yaml'
 
 class SCM
     def initialize(version50)
         @version50 = version50
     end
 
+    # create a branch
+    def branch b
+    end
+
+    # checkout a branch
+    def checkout b
+        self.save({ :quiet => true })
+    end
+
     # commit changes without pushing
-    def commit
+    def commit(options = {})
+        # make sure we're not in a warp
+        config = @version50.parse_config
+        if config['warp']
+            puts "\033[31mYou cannot commit any changes until you warp back to the present!\033[0m"
+            return
+        end
+
         # check if we have anything to commit
         files = self.status
         if files[:added].length == 0 && files[:modified].length == 0 && files[:deleted].length == 0
-            puts "Nothing has changed since your last save!"
+            if !options[:quiet]
+                puts "Nothing has changed since your last save!"
+            end
 
         # prompt for commit message
         else
@@ -25,6 +44,9 @@ class SCM
     def config info
     end
 
+    def download(url, path = '')
+    end
+
     # initialize a new repo
     def init
     end
@@ -33,6 +55,10 @@ class SCM
     def log
     end
 
+    # return to the present
+    def present
+    end
+
     def pull
     end
 
@@ -40,9 +66,48 @@ class SCM
     def push
     end
 
+    # recover a path from a warp
+    def recover path
+        # determine what warp we're in
+        config = @version50.parse_config
+        if !config['warp']
+            puts "\033[31mYou have to warp to another revision before you can recover anything!\033[0m"
+            return
+        end
+
+        # make sure file exists
+        if Dir.glob(path).empty?
+            puts "\033[31mSpecify a valid path to recover!\033[0m"
+            return
+        end
+
+        # copy all files in path into warps folder
+        warp = config['warp']
+        files = Dir.glob path
+        root = @version50.root
+        files.each do |f|
+            FileUtils.mkdir_p(root + '/.version50-warps/' + File.dirname(f))
+            FileUtils.cp(f, root + '/.version50-warps/' + File.dirname(f))
+        end
+
+        # display which files were recovered
+        if files.length == 1
+            puts "\033[032mRecovered #{files[0]}!\033[0m"
+        else
+            puts "\033[032mRecovered:\n"
+            files.each do |f|
+                puts "* #{f}"
+            end
+            puts "\033[0m"
+        end
+    end
+
+    def reset
+    end
+
     # shortcut for commit and push
-    def save
-        self.commit
+    def save(commit_options = {})
+        self.commit commit_options
         self.push
     end
 
@@ -51,20 +116,49 @@ class SCM
     end
 
     # warp to a specific revision
-    def warp
-        # save before doing anything
-        self.save
+    def warp revision = nil
+        # warp back to the present
+        if revision == 'present'
+            puts "\033[032mWarped back to the present!\033[0m"
+            self.present
+
+            # remove warp number from .version50
+            config = @version50.parse_config
+            config.delete 'warp'
+            File.open(@version50.root + '/.version50', 'w') do |f|
+                f.write config.to_yaml
+            end
+
+            # move files from warps folder
+            root = @version50.root
+            FileUtils.mv(Dir.glob(root + '/.version50-warps/*'), root)
+            return false
+        end
 
-        # prompt for revision
-        print "\033[34mWhat version would you like to warp to?\033[0m "
-        revision = $stdin.gets.chomp.to_i(10)
+        # save before doing anything
+        self.save({ :quiet => true })
 
-        puts "\033[32mPutting files into version50-#{revision}...\033[0m "
+        # prompt for revision if not given
+        if !revision
+            print "\033[34mWhat version would you like to warp to?\033[0m "
+            revision = $stdin.gets.chomp.to_i(10)
+        else
+            revision = revision.to_i(10)
+        end
 
         # get revision from numerical index
         revisions = self.log
         r = revisions[revisions.length - revision]
 
+        # record where we warped
+        config = @version50.parse_config
+        config['warp'] = revision
+        File.open(@version50.root + '/.version50', 'w') do |f|
+            f.write config.to_yaml
+        end
+
+        puts "\033[032mWarped to revision ##{revision}!\033[0m"
+
         # add numerical index to return value
         r[:revision] = revision
         return r

data/lib/version50.rb

@@ -5,15 +5,39 @@ require 'optparse'
 require 'yaml'
 require 'net/http'
 require 'net/https'
+require 'fileutils'
 require 'highline/import'
 HighLine.track_eof = false
 
 class Version50
-    def initialize(args)
+    def initialize(action, args = [])
+        # help text
+        if action == 'help'
+            return self.help
+        end
+
+        # version number
+        if action == 'version'
+            return self.version
+        end
+
         # parse configuration
         config = self.parse_config
         @scm = self.scm config
 
+        # download a repository
+        if action == 'download'
+            if args[0] =~ /git/
+                @scm = self.scm({ 'scm' => 'git' })
+            end
+
+            # download repository
+            puts "\033[033mDownloading project...\033[0m"
+            @scm.download args[0], args[1]
+            puts "\033[032mDownload complete!\033[0m"
+            return
+        end
+
         # no configuration file, so prompt to create a new project
         if !config
             config = self.create
@@ -24,37 +48,62 @@ class Version50
         # set user info
         @scm.config config
 
+        # create a new branch
+        if action == 'branch'
+            @scm.branch args[0]
+        end
+
         # commit a new version without pushing
-        if args[:action] == 'commit'
+        if action == 'commit'
             @scm.commit
         end
 
         # view the commit history
-        if args[:action] == 'history' || args[:action] == 'log'
+        if action == 'history' || action == 'log'
             commits = @scm.log
             self.output_history commits
         end
 
+        # pull from the main remote
+        if action == 'pull'
+            @scm.pull
+        end
+
         # push the current project
-        if args[:action] == 'push'
+        if action == 'push'
             @scm.push
         end
 
+        # undo all changes since last save
+        if action == 'reset'
+            @scm.reset
+        end
+
         # save a new version, which means commit and push
-        if args[:action] == 'save'
+        if action == 'save'
             @scm.save
             puts "\n\033[032mSaved a new version!\033[0m"
         end
 
+        # switch to a branch
+        if action == 'switch'
+            @scm.checkout args[0]
+        end
+
         # get the current status of files
-        if args[:action] == 'status'
+        if action == 'status'
             files = @scm.status
             self.output_status files
         end
 
+        # recover a file from a warp
+        if action == 'recover'
+            @scm.recover args[0]
+        end
+
         # warp to a past version
-        if args[:action] == 'warp'
-            @scm.warp
+        if action == 'warp'
+            @scm.warp args[0]
         end
     end
 
@@ -124,16 +173,28 @@ class Version50
         end
 
         # save config
+        FileUtils.mkdir(Dir.pwd + '/.version50-warps')
         File.open(Dir.pwd + '/.version50', 'w') do |f|
             f.write config.to_yaml
         end
 
-        puts "\n\033[032mYour project was created successfully, now have fun!"
+        puts "\n\033[032mYour project was created successfully!"
         puts "<3 version50\033[0m"
 
         return config
     end
 
+    # help text
+    def help
+        puts "\033[34mThis is Version50.\033[0m"
+        puts "Here are some things you can do!"
+        puts "* history: View the history of your project's versions"
+        puts "* recover: Recover an earlier version of a file"
+        puts "* save: Save a version of your project"
+        puts "* status: Get the current status of your project"
+        puts "* warp: Warp back to an earlier point in time"
+    end
+
     # given a parsed SCM history output, show log
     def output_history commits
         # output each commit
@@ -234,4 +295,9 @@ class Version50
             return Git.new(self)
         end
     end
+
+    # version number
+    def version
+        puts "This is Version50 v0.0.1"
+    end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: version50
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tommy MacWilliam
@@ -48,7 +48,7 @@ dependencies:
 description: A student-friendly SCM abstraction layer.
 email: tmacwilliam@cs.harvard.edu
 executables: 
-- version50
+- v50
 extensions: []
 
 extra_rdoc_files: []
@@ -57,7 +57,7 @@ files:
 - lib/version50.rb
 - lib/version50/git.rb
 - lib/version50/scm.rb
-- bin/version50
+- bin/v50
 homepage: https://github.com/tmacwill/version50
 licenses: []