manifestly 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a07010d357d1a65507c6b7a8326b9db4b82814d
-  data.tar.gz: 01e562142d702cb0c91709e4118aa3522e0975c3
+  metadata.gz: d62c8dfcbbf81b5c0214dba1f2af56f95629122b
+  data.tar.gz: ac1e5f68ffd0c99cbfd42a99cd8119b8602fd2db
 SHA512:
-  metadata.gz: 6306bba1d20524ce11f7bf7ba112da59ae5eee735daf8185f6ba4f9875f5eb7046bfa48932b81c9d88f8b23e0d4a257df099f1da94458a2f4a3cc576057330d4
-  data.tar.gz: a1c736ab12d009589d19585e484e21ebdd62cc1a2bb9223b2940aecdff80f235a47345b59d10f937d5fb887360bc149ec4f0a3b5f56f0e24ac4d20f4b3c2c42b
+  metadata.gz: 2b5b02fb9c83d0082f5a1f641ed377a32daeafd4dd317c7cef1d09a963ed5d4381ab45776bf921183ee049fe4b37996989aa079cf862f16f80137f2212da78fa
+  data.tar.gz: 587e782061553e4c1957e25e3bec0361d2657c5dc893fb8335d33c5248d64d550e1070a2b614d798875ce45a57e15cf592c34f9f0b46adcad7ba8abb7cebe88c

data/lib/manifestly/cli.rb

@@ -234,7 +234,7 @@ module Manifestly
 
     end
 
-    desc "upload", "Upload a local manifest file to a manifest repository"
+    desc "upload", "Upload a local manifest file to a manifest repository and print its SHA"
     file_option("upload")
     repo_option
     repo_file_option("The name of the manifest to upload to in the repository, with path if applicable")
@@ -246,15 +246,16 @@ module Manifestly
     long_desc <<-DESC
       Upload a manifest when you want to share it with others or persist it
       permanently.  Since manifests are stored remotely as versions of a file
-      in git, it cannot be changed once uploaded.
+      in git, it cannot be changed once uploaded.  Prints out the manifest SHA.
     DESC
     def upload
       repository = Repository.load_cached(options[:repo], update: true)
 
       begin
         repository.push_file!(options[:file], options[:repo_file], options[:message])
-      rescue Manifestly::Repository::ManifestUnchanged => e
-        say "The manifest you requested to push is already the latest and so could not be pushed."
+      rescue Manifestly::Repository::ManifestUnchanged
+      ensure
+        say repository.current_commit
       end
     end
 

data/lib/manifestly/repository.rb

@@ -88,7 +88,7 @@ module Manifestly
       full_repository_file_path = File.join(@path, repository_file_path)
       FileUtils.cp(local_file_path, full_repository_file_path)
       git.add(repository_file_path)
-      raise ManifestUnchanged if git.status.changed.empty?
+      raise ManifestUnchanged if git.status.changed.empty? && git.status.added.empty?
       git.commit(message)
       git.push
     end

data/lib/manifestly/version.rb

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

metadata

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