manifestly 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c315b69f70efd0a0a9fbb96b837ec5b8003651
-  data.tar.gz: 252ae02ec9b3b53fe3f9022f5dac47be059d776f
+  metadata.gz: 7a07010d357d1a65507c6b7a8326b9db4b82814d
+  data.tar.gz: 01e562142d702cb0c91709e4118aa3522e0975c3
 SHA512:
-  metadata.gz: ddb360f349ff360da7593cecf02e6e0bfc8d94f181844cf4068866e5794f07c290fc5914835158d6e4db67a77957cc8be81c9dbffd43a7d79670ef1ac7c4fc71
-  data.tar.gz: b6a5647e87acad501c243acda516ff23a5f552f8c4439fc71bd0eefb64c3d798c84658042bbfc4689945f395ff4dc2d79d82fab4ca77523317b75a8b26bf99e2
+  metadata.gz: 6306bba1d20524ce11f7bf7ba112da59ae5eee735daf8185f6ba4f9875f5eb7046bfa48932b81c9d88f8b23e0d4a257df099f1da94458a2f4a3cc576057330d4
+  data.tar.gz: a1c736ab12d009589d19585e484e21ebdd62cc1a2bb9223b2940aecdff80f235a47345b59d10f937d5fb887360bc149ec4f0a3b5f56f0e24ac4d20f4b3c2c42b

data/lib/manifestly/cli.rb

@@ -12,6 +12,12 @@ module Manifestly
     include CommandLineReporter
     include Manifestly::Ui
 
+    # https://github.com/erikhuda/thor/issues/244
+    # http://stackoverflow.com/a/18490048/1664216
+    def self.exit_on_failure?
+      true
+    end
+
     #
     # Common command line options
     #
@@ -175,7 +181,7 @@ module Manifestly
     DESC
     def create
       manifest = if options[:based_on]
-        load_manifest(file: options[:based_on]) || return
+        load_manifest(file: options[:based_on]) || error!
       else
         Manifest.new
       end
@@ -212,17 +218,17 @@ module Manifestly
     DESC
     def apply
       begin
-        manifest = load_manifest(file: options[:file]) || return
+        manifest = load_manifest(file: options[:file]) || error!
         manifest.items.each{ |item| item.checkout_commit!(options[:update]) }
       rescue Manifestly::ManifestItem::MultipleSameNameRepositories => e
         say "Multiple repositories have the same name (#{e.message}) so we " +
             "can't apply the manifest. Try limiting the search_paths or " +
             "separate the duplicates."
-        return
+        error!
       rescue Manifestly::Repository::CommitNotPresent => e
         say "Could not find commit #{e.sha} in repository #{e.repository.github_name_or_path}. " +
             "Try running again with the `--update` option."
-        return
+        error!
       end
 
 
@@ -276,7 +282,7 @@ module Manifestly
         repository.get_commit_content(options[:sha])
       rescue Manifestly::Repository::CommitNotPresent
         say('That SHA is invalid')
-        return
+        error!
       end
 
       save_as = options[:save_as]
@@ -419,7 +425,7 @@ module Manifestly
       if !from_manifest || !to_manifest
         say("Could not load the 'from' manifest so cannot continue with the diff.") if !from_manifest
         say("Could not load the 'to' manifest so cannot continue with the diff.") if !to_manifest
-        return
+        error!
       end
 
       manifest_diff = ManifestDiff.new(from_manifest, to_manifest)
@@ -758,5 +764,9 @@ module Manifestly
       nil
     end
 
+    def error!
+      exit 1
+    end
+
   end
 end

data/lib/manifestly/repository.rb

@@ -122,7 +122,16 @@ module Manifestly
     end
 
     def get_commit_file(sha)
-      diff_string = git.show(sha)
+      diff_string = begin
+        git.show(sha)
+      rescue Git::GitExecuteError => e
+        if is_commit_not_found_exception?(e)
+          raise CommitNotPresent.new(sha, self)
+        else
+          raise
+        end
+      end
+
       sha_diff = Diff.new(diff_string)
 
       raise(CommitContentError, "No content to retrieve for SHA #{sha}!") if sha_diff.num_files == 0
@@ -157,7 +166,8 @@ module Manifestly
     end
 
     def is_commit_not_found_exception?(e)
-      e.message.include?("fatal: reference is not a tree")
+      e.message.include?("fatal: reference is not a tree") ||
+      e.message.include?("fatal: ambiguous argument")
     end
 
     def current_branch_name

data/lib/manifestly/version.rb

@@ -1,3 +1,3 @@
 module Manifestly
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifestly
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor