teapot 3.5.1 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ace82267f885a0c08463e11c4d287fb8f3925305fcb8fd054ea6ae3ed1f959
-  data.tar.gz: f365dd8ae5ed06725236fe7eb5723251c3441bb30069fd41bd9f081b817a9ef4
+  metadata.gz: 07b32fe7cada8717c48838a537d67f16847a2dbe649e7642a36c23c94bcade3f
+  data.tar.gz: 4b8a7bdccf99fd72286e3e39b9c81e276ad7d4cec13328d4cc19db5c0db46224
 SHA512:
-  metadata.gz: e97038ad00666d18ca716fce16f641180988b5ec5f71a162e38c68d9c69e843399a8bbf6adb75c46e7470980aff08df4be9c8ca4aabe6b157360da43a9a65269
-  data.tar.gz: 70772f52abb1b14cb4141cbf0f383be68a4716acd8a4ee1b4b26b60d2aa2a684752a834c5268365e37dbdce95933e8309ee77ec04d41900ede455c982b186236
+  metadata.gz: cc50bb10bfbd6c2055c1c0c1582b21bddf2a5cec6f5f3c0b0e8bba604969c329f24405726cf2dd947531cf527efeb92f54b0c2236aa8513b3376c6832a302a08
+  data.tar.gz: 39cfa9e57f70cac8d1fd719b30c6049f39158e7c8b31a43fee4fd57231c617cc5bf5434c468a124a673d45e6640d45ab3a380a051d194ad43e37c4fc18880053

data/lib/teapot/command/fetch.rb

@@ -122,7 +122,15 @@ module Teapot
 				# We should prompt for username/password if required...
 				return Rugged::Credentials::SshKeyFromAgent.new(username: username)
 			end
-
+			
+			def modified?(repository)
+				repository.status.each do |path, status|
+					return true if status != [:ignored]
+				end
+				
+				return false
+			end
+			
 			def clone_or_pull_package(context, configuration, package, package_lock, logger)
 				logger.info "Processing #{package}..." #.color(:cyan)
 
@@ -150,7 +158,7 @@ module Teapot
 					repository = Rugged::Repository.new(destination_path.to_s)
 
 					# Are there uncommitted changes in the work tree?
-					if repository.to_enum(:status).any?
+					if modified?(repository)
 						raise FetchError.new(package, "Uncommited local modifications")
 					end
 					

data/lib/teapot/command/status.rb

@@ -35,26 +35,33 @@ module Teapot
 				end
 			end
 			
+			def repository_for(package)
+				Rugged::Repository.new(package.path.to_s)
+			rescue Rugged::RepositoryError
+				# In some cases, a repository might not exist yet, so just skip the package.
+				nil
+			end
+			
 			def process(selection)
 				context = selection.context
 				terminal = self.terminal
 				
 				selection.resolved.each do |package|
-					repository = Rugged::Repository.new(package.path.to_s)
-					
-					changes = {}
-					repository.status do |file, status|
-						unless status == [:ignored]
-							changes[file] = status
+					if repository = repository_for(package)
+						changes = {}
+						repository.status do |file, status|
+							unless status == [:ignored]
+								changes[file] = status
+							end
+						end
+						
+						next if changes.empty?
+						
+						terminal.puts "Package #{package.name} (from #{package.path}):"
+						
+						changes.each do |file, statuses|
+							terminal.puts "\t#{file} (#{statuses})", style: statuses.last
 						end
-					end
-					
-					next if changes.empty?
-					
-					terminal.puts "Package #{package.name} (from #{package.path}):"
-					
-					changes.each do |file, statuses|
-						terminal.puts "\t#{file} (#{statuses})", style: statuses.last
 					end
 				end
 			end

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "3.5.1"
+	VERSION = "3.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build