autoshell 1.0.0.pre.beta → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928a9e9b3812a58ba5dc49d411c8d3aa8e1d8ca2
-  data.tar.gz: de0ace26b2252873a5c1ee7a211a39a2f31a356a
+  metadata.gz: 58f7cc0a022ee148921ad31525211ef83963e842
+  data.tar.gz: abc7b801e9b7ecf76cd8750663917bca854fe0ba
 SHA512:
-  metadata.gz: b1f0cdea37569f2a28b18de0cb4c4bc67be9efb2e97defdc89c616a18c872aa2c25ddf7e2cb418049e8536d8d700d9b0709556c116c0207fe108f45ba28cc839
-  data.tar.gz: 3a009f5a35d003af45c22648b25eb5212529ea8eaaadd959212143fb0cdd5ddefa1a1613036dc770673b43a0975ebcf2383f24ae881172651211b79f77e62a86
+  metadata.gz: 7d3cc1ae23a9f0fc436d297afb34ef0171a6a632758eeff03fe592f939ab258ef21c90b69ebebc7018da6dcc9ac75a375f78d9d4a53ca1a1e4a005cf96a3c78f
+  data.tar.gz: 33257ae7b9a532a50b0ddf199841791540969413f11936cf75a7ae74571a927c9014277c53f8964738cb86596ea1e45f1d267604399088fc4666e520de35b0da

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+*.gem

data/README.md

@@ -20,7 +20,7 @@ Create a new autoshell object with optional path and environment hash.
 
 ```ruby
 env = { 'FOO' => 'bar' }
-sh = Autoshell.new('~/code/autoshell', env)
+sh = Autoshell.new('~/code/autoshell', env: env)
 sh.clone('https://github.com/ryanmark/autoshell-ruby.git')
 sh.setup_environment
 sh.cd |s| { s.run('bundle', 'exec', 'rake', 'test') }

data/lib/autoshell/filestuff.rb

@@ -115,9 +115,15 @@ module Autoshell
 
     # Copy this working dir to another path
     # @param path [String] destination path to copy to
-    def copy_to(path = nil)
+    def copy_to(path = nil, force: nil)
       return super if path.nil?
-      cp '.', path
+
+      unless Dir.exist? working_dir
+        raise CommandError,
+              "copy_to: The directory '#{working_dir}' does not exist"
+      end
+
+      cp '.', path, force: force
       self.class.new(expand path)
     end
 

data/lib/autoshell/git.rb

@@ -6,10 +6,27 @@ module Autoshell
   #   @return [String] (master) branch of the current repo
   module Git
     def branch
-      @branch ||= git? ? git('rev-parse', '--abbrev-ref', 'HEAD') : 'master'
+      @branch ||= 'master'
     end
     attr_writer :branch
 
+    # Set the branch from a repo url
+    #
+    # @param [String] Git repository URL
+    # @return [string] Branch name
+    def branch_from_repo_url(repo_url)
+      if repo_url =~ /#\S+[^\/]/
+        @branch = repo_url.split('#')[1]
+      else
+        @branch = 'master'
+      end
+    end
+
+    def commit_hash_for_checkout
+      @commit_hash_for_checkout ||= 'HEAD'
+    end
+    attr_writer :commit_hash_for_checkout
+
     # Has this repo been cloned to disk?
     #
     # @return [Boolean] True if this dir is a cloned repo
@@ -22,13 +39,14 @@ module Autoshell
     # @return [String] Output of git commands
     def update
       [
-        git('checkout', working_dir),
-        git('clean', '-fd'),
-        git('checkout', 'master'),
+        git('checkout', '.'),
+        git('clean', '-ffd'),
+        git('checkout', branch),
         git('pull', '--recurse-submodules=yes'),
         git('fetch', 'origin'),
-        git('checkout', branch),
-        git('submodule', 'update', '--init')
+        git('checkout', commit_hash_for_checkout),
+        git('submodule', 'update', '--init'),
+        git('clean', '-ffd')
       ].join("\n")
     end
 
@@ -47,7 +65,17 @@ module Autoshell
     # @return [String] Output of git commands
     def clone(repo_url)
       mkpdir working_dir
-      run 'git', 'clone', '--recursive', repo_url, working_dir
+      run 'git', 'clone', '--recursive', repo_url.split('#')[0], working_dir
+      branch_from_repo_url(repo_url)
+      update
+    end
+
+    # Checkout a specific hash on the repo
+    #
+    # @param [String] Git version hash
+    # @return [String] Output of git commands
+    def checkout_version(version_hash)
+      git 'checkout', version_hash || 'HEAD'
     end
 
     # Get the current commit hash

data/lib/autoshell/version.rb

@@ -1,4 +1,4 @@
 # Version info
 module Autoshell
-  VERSION = '1.0.0-beta'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoshell
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryan Mark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -149,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5