manifestly 2.1.0.pre.pre → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe2b21d657ba066cc4dada41055eaaafefb03e5
-  data.tar.gz: 2e59ff433c6d00b1f5b1c33560a6dc3e85891cd8
+  metadata.gz: f0c315b69f70efd0a0a9fbb96b837ec5b8003651
+  data.tar.gz: 252ae02ec9b3b53fe3f9022f5dac47be059d776f
 SHA512:
-  metadata.gz: 1bc430ab5687f56cc6d316a4d8527aa815fa24279aea3fbb394d61c902989059618f470afb70e25a7f4ab7003beb6a21763ac56832673a24247095177414e184
-  data.tar.gz: 25495301744d85db2524b62f390a5cb6d4222f63e1e1bb27854c10143447e363ecdc5dc155d75cc41ad22d78f40b95f29bc6c60807601befe851098f281760d2
+  metadata.gz: ddb360f349ff360da7593cecf02e6e0bfc8d94f181844cf4068866e5794f07c290fc5914835158d6e4db67a77957cc8be81c9dbffd43a7d79670ef1ac7c4fc71
+  data.tar.gz: b6a5647e87acad501c243acda516ff23a5f552f8c4439fc71bd0eefb64c3d798c84658042bbfc4689945f395ff4dc2d79d82fab4ca77523317b75a8b26bf99e2

data/README.md

@@ -11,13 +11,9 @@ Manifestly is run as a standalone executable.  Install with:
 
     $ gem install manifestly
 
-And then execute:
+To update to the latest version:
 
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install manifestly
+    $ gem update manifestly
 
 ## Usage
 

data/lib/manifestly/cli.rb

@@ -200,19 +200,32 @@ module Manifestly
     desc "apply", "Sets the manifest's repository's current states to the commits listed in the manifest"
     search_paths_option
     file_option("apply")
+    method_option :update,
+              desc: "Updates (fetches) repository content if a manifest commit is not found",
+              banner: '',
+              aliases: "-u",
+              type: :boolean,
+              default: false,
+              required: false
     long_desc <<-DESC
       Check to make sure the repositories you are deploying from have their state committed.
     DESC
     def apply
       begin
         manifest = load_manifest(file: options[:file]) || return
+        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
+      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
       end
-      manifest.items.each(&:checkout_commit!)
+
+
     end
 
     desc "upload", "Upload a local manifest file to a manifest repository"

data/lib/manifestly/manifest.rb

@@ -30,9 +30,8 @@ module Manifestly
     end
 
     def self.read_file(filename, repositories)
-      File.open(filename, 'r') do |file|
-        read_lines(file, repositories)
-      end
+      lines = File.read(filename)
+      read_lines(lines, repositories)
     end
 
     def self.read_lines(lines, repositories)

data/lib/manifestly/manifest_item.rb

@@ -26,8 +26,8 @@ module Manifestly
       @repository.fetch
     end
 
-    def checkout_commit!
-      @repository.checkout_commit(@commit.sha)
+    def checkout_commit!(fetch_if_unfound=false)
+      @repository.checkout_commit(@commit.sha, fetch_if_unfound)
     end
 
     def to_file_string

data/lib/manifestly/repository.rb

@@ -4,7 +4,15 @@ require 'ostruct'
 module Manifestly
   class Repository
 
-    class CommitNotPresent < StandardError; end
+    class CommitNotPresent < StandardError
+      attr_reader :sha, :repository
+      def initialize(sha, repository)
+        @sha = sha
+        @repository = repository
+        super("SHA '#{sha}' not found in repository '#{repository.github_name_or_path}'")
+      end
+    end
+
     class ManifestUnchanged < StandardError; end
     class CommitContentError < StandardError; end
     class NoCommitsError < StandardError; end
@@ -101,7 +109,7 @@ module Manifestly
       begin
         git.gcommit(sha).tap(&:sha)
       rescue Git::GitExecuteError => e
-        raise CommitNotPresent, "SHA not found: #{sha}"
+        raise CommitNotPresent.new(sha, self)
       end
     end
 
@@ -131,8 +139,25 @@ module Manifestly
       end
     end
 
-    def checkout_commit(sha)
-      git.checkout(sha)
+    def checkout_commit(sha, fetch_if_unfound=false)
+      begin
+        git.checkout(sha)
+      rescue Git::GitExecuteError => e
+        if is_commit_not_found_exception?(e)
+          if fetch_if_unfound
+            git.fetch
+            checkout_commit(sha, false)
+          else
+            raise CommitNotPresent.new(sha, self)
+          end
+        else
+          raise
+        end
+      end
+    end
+
+    def is_commit_not_found_exception?(e)
+      e.message.include?("fatal: reference is not a tree")
     end
 
     def current_branch_name

data/lib/manifestly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifestly
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre.pre
+  version: 2.2.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -183,9 +183,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.8