dssx 0.0.3.a → 0.0.3.b

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODBkODNjYmQzOWYxMzM3MTlmNTU5MDNkNmZjZDdjZGExNmQzZTM5Ng==
+    NzBlZmZlN2JmMjQ4NWRjZDNlYTg0NTA4ZjkxZWRhZTYwZjdkNzI4Ng==
   data.tar.gz: !binary |-
-    YTE1ZjNlZDhiOTU0MDZjZTNkM2E4MmUyNWRmMTAxM2NmOWE0MWExMQ==
+    MDY2MWFiOTZiMGMyMmVhNTY2NTY2MThmMGVkNDk1Yjk0MzQ4YTllMA==
 SHA512:
   metadata.gz: !binary |-
-    OWU2YjMzZTEzMzM5NWUxOWJhNWNhNmZlMTdiYmZjNjllMzllMTYzYTRkZWRl
-    ZGNlOGQ4YTE2YWJjZDY3ODZhOTA0NDhjN2ZlYTU0MWYwMmU4ODllZTU5MTdi
-    NTE5M2ZjZTYyZmNmZDE3NjMzMmVlZDFhNTcwODQ5OGI3MTExZDA=
+    NzhjOTQzNDkwMTNhZjQxMjk0ZDU2NjUwYWZmYTI3YmExZDg4MjJhMTZmMWFh
+    YzBjYmQyYTQ2Y2FmNzIxMzhkNzlmYWE5MjExOTg0MmUwMTEyMTQ2YzRlZjU5
+    OTdkZmNlNTUzMDM3YjgxNmQ2YTFlM2E5MjAzYWY1NGQ4MzQxMjI=
   data.tar.gz: !binary |-
-    MGEyM2I2ODk0ZWNlYjhhYTdlZDg3MzRjNDM2OTJlZjFjNzg5NGU5NDNiNjRl
-    OGU1NDlkNGUzN2YwMjAyMzkzYmNlMDBjMTYzYTU2YzRjODI1NzMyZGRjNmNl
-    YWZiMmQzODBmNzE3NzYwYWRmYjEwMDVmOGM1NzNmOWMxYzAzYmQ=
+    NmIwYWE2MzExYWY4M2QwYzY3MmYxMmFlZWM3ODAzMWI4OGVlYTJlZjdlMmNm
+    ZGY3M2RiODM5M2EwMDA5YzM3YzM4MDU4ZmQyNTcxY2E3NTVhMGE1MTRlMzhk
+    OTk0NTUxOTk2YWEyZjAyZTRkMDE5ZmZiMDNkNWQ1YzMyY2FiMzU=

data/lib/dssx.rb

@@ -1,6 +1,6 @@
 
 module Dssx
-  VERSION = '0.0.3.a'
+  VERSION = '0.0.3.b'
 end
 
 begin

data/lib/dssx/cli.rb

@@ -6,26 +6,36 @@ require 'thor'
 module Dssx
   class CLI < Thor
     #include Thor::Actions
+    class_option :version, :type => :boolean
+    desc "version", "Show dssx version"
+    def version
+      if options[:version]
+        puts "dssx version #{find_version}"
+      end
+    end
+    default_task :version
+
+    
     desc "add [FILES]", "Add and Commit new files"
-    def add(*files)
-      file_list = files * ' '
+    def add(file, *files_splat)
+      file_list = flatten_default_splat(file, files_splat)
       puts "dssx add #{file_list}" 
       puts "=> dssc ci -new #{file_list}" 
     end
 
 
     desc "remove [PATH]", "Remove file/folder from repository"
-    def remove(*path=Dir.pwd)
-      path_list = path * ' '
-      puts "dssx rm #{path_list}" 
+    def remove(path, *path_splat)
+      path_list = flatten_default_splat(path, path_splat)
+      puts "dssx remove #{path_list}" 
       puts "=> dssc retire #{path_list}" 
     end
 
     desc "rm [PATH]", "Alias for remove"
-    def rm(*path=Dir.pwd)
+    def rm(path, *path_splat)
       invoke :remove
     end
-    
+
 
     option :verbose, :type => :boolean
     desc "status [PATH]", "Check status"
@@ -39,8 +49,8 @@ module Dssx
 
     option :r
     desc "update [PATH]", "Update to latest repository version"
-    def update(*path=Dir.pwd)
-      path_list = path * ' '
+    def update(path=Dir.pwd, *path_splat)
+      path_list = flatten_default_splat(path, path_splat)
       puts "dssx update #{path_list}" 
       cmd =  "dssc populate -recursive -replace -unify #{path_list}" 
       cmd = cmd + " --version #{options[:r]}" if options[:r]
@@ -48,8 +58,8 @@ module Dssx
     end
 
     desc "up [PATH]", "Alias for update"
-    def up(*path=Dir.pwd)
-      invokee :update
+    def up(path=Dir.pwd, *path_splat)
+      invoke :update
     end
 
     desc "co [URL]", "NOT IMPLEMENTED, dssc does not do checkouts"
@@ -58,20 +68,20 @@ module Dssx
     end
 
     desc "commit[PATH]", "Commit changes to repository"
-    def commit(*path=Dir.pwd)
-      path_list = path * ' '
+    def commit(path=Dir.pwd, *path_splat)
+      path_list = flatten_default_splat(path, path_splat)
       puts "dssx commit #{path_list}" 
       puts "=> dssc ci #{path_list}" 
     end
 
     desc "ci [PATH]", "Alias for commit"
-    def ci(*path=Dir.pwd) 
+    def ci(path=Dir.pwd, *path_splat) 
       invoke :commit
     end
 
     desc "lock [PATH]", "Lock file"
-    def lock(*path=Dir.pwd) 
-      path_list = path * ' '
+    def lock(path=Dir.pwd, *path_splat) 
+      path_list = flatten_default_splat(path, path_splat)
       puts "dssx lock #{path_list}" 
       puts "=> dssc co -lock -nocomment #{path_list}" 
     end
@@ -91,7 +101,7 @@ module Dssx
       puts "  NOT IMPLEMENTED" 
       #puts "=> dssc vhistory #{path}" 
     end
-    
+
     desc "log [PATH]", "View commit log"
     def log(path=Dir.pwd)
       puts "dssx log #{path}" 
@@ -100,11 +110,33 @@ module Dssx
 
 
     desc "revert [PATH]", "Revert file back to previous version"
-    def revert(*path=Dir.pwd)
-      path_list = path * ' '
+    def revert(path=Dir.pwd, *path_splat)
+      path_list = flatten_default_splat(path, path_splat)
       puts "dssx revert #{path_list}" 
       puts "=> dssc cancel -force #{path_list}" 
     end
 
+    ## Helper Functions 
+    #    NOT Thor Tasks
+    no_tasks do
+      def flatten_default_splat(a, *b)
+        path_list = a + ' ' + b * ' ' 
+      end
+      
+      ## name and versio taken from 
+      ## https://github.com/mojombo/rakegem
+      def name
+        #@name ||= Dir['*.gemspec'].first.split('.').first
+        'dssx'
+      end
+
+      def find_version
+        lib_path     = File.expand_path( File.join(File.dirname(__FILE__), '..'))
+        version_file = File.join(lib_path, "#{name}.rb")
+        line         = File.read( version_file )[/^\s*VERSION\s*=\s*.*/]
+        line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+      end
+
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dssx
 version: !ruby/object:Gem::Version
-  version: 0.0.3.a
+  version: 0.0.3.b
 platform: ruby
 authors:
 - Morgan Prior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor