teapot 3.5.4 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b04440536c596d23f4366487b76b954e6c10a6acc7a4371ca2d3dc158a3b78c
-  data.tar.gz: 99bda0d60b0e24fde2dd01f2a50b793173970de35c99483745e304b961dafd43
+  metadata.gz: 742147841aebb1df987a75d2ffefcb764d9d42f6faf5492bdd273c62a8e195ce
+  data.tar.gz: 11c7a76cfe57be54d9a5864b2e0d7eb821ab780c4128df78ca09e555599c7dca
 SHA512:
-  metadata.gz: f3fd801e262145f214df86c5a59b33bffee8a884279a5d35df832f0831567e3cad1566bf00c02d99e999c2fd44698cacb13d071a212eb1fe51aa8e4a74e85ba0
-  data.tar.gz: a089693d16dee80e067096f7c58bf352a7bae602a2ba54e8c6ada092709db235f273ff957553ad882d75bc77dc0f2532f1288fc4e9ef770290a4245f5f109734
+  metadata.gz: '001587e6eca1be37e6697b2b603208afe8d5685b14a8364603325d9aa24af9c2af3a12effec6bf0f9513731cffd05d7ec76125333d3fa3fd9a76e9cf66467749'
+  data.tar.gz: 503bd6ed1aba820ce830b5e856468b9d990b179e2f2da32c7d1985a314f1e6ff48a54d8a0883a1352b7dd30380e51c951e2fdbf234d716926033700208f88b3a

data/bin/teapot

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
@@ -20,6 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../lib/teapot/command'
+require_relative "../lib/teapot/command"
 
 Teapot::Command::Top.call

data/context/getting-started.md

@@ -0,0 +1,139 @@
+# Getting Started
+
+This guide explains how to use `teapot` to manage cross-platform project dependencies and build systems.
+
+## Installation
+
+Ensure that you already have a working install of Ruby 2.0.0+ and run the following to install `teapot`:
+
+~~~ bash
+$ gem install teapot
+~~~
+
+## Create Project
+
+Firstly, create your project by running:
+
+~~~ bash
+$ teapot create "My Project" https://github.com/kurocha generate-project
+$ cd my-project
+~~~
+
+You will be asked to merge the project file. At present, merge tools are not very good and thus you may need to take a moment to review the changes. You want to keep most of the original file, but you would like to add the `define_target` blocks which are being added.
+
+In the resulting project directory that has been created, you can see the list of dependencies:
+
+~~~ bash
+$ teapot list
+... lots of output ...
+~~~
+
+To only see things exported by your current project, you can run:
+
+~~~ bash
+$ teapot list root
+Package root (from /private/tmp/my-project):
+	#<Teapot::Project "my-project">
+		My Project description.
+		- Summary: A brief one line summary of the project.
+		- License: MIT License
+		- Version: 0.1.0
+		- Author: Samuel Williams <samuel.williams@oriontransfer.co.nz>
+	#<Teapot::Target "my-project-library">
+		- depends on "Build/Files"
+		- depends on "Build/Clang"
+		- depends on :platform
+		- depends on "Language/C++14" {:private=>true}
+		- provides "Library/MyProject"
+	#<Teapot::Target "my-project-test">
+		- depends on "Library/UnitTest"
+		- depends on "Library/MyProject"
+		- provides "Test/MyProject"
+	#<Teapot::Target "my-project-executable">
+		- depends on "Build/Files"
+		- depends on "Build/Clang"
+		- depends on :platform
+		- depends on "Language/C++14" {:private=>true}
+		- depends on "Library/MyProject"
+		- provides "Executable/MyProject"
+	#<Teapot::Target "my-project-run">
+		- depends on "Executable/MyProject"
+		- provides "Run/MyProject"
+	#<Teapot::Configuration "development" visibility=private>
+		- references root from /private/tmp/my-project
+		- clones platforms from https://github.com/kurocha/platforms
+		- clones unit-test from https://github.com/kurocha/unit-test
+		- clones generate-cpp-class from https://github.com/kurocha/generate-cpp-class
+		- clones generate-project from https://github.com/kurocha/generate-project
+		- clones variants from https://github.com/kurocha/variants
+		- clones platform-darwin-osx from https://github.com/kurocha/platform-darwin-osx
+		- clones platform-darwin-ios from https://github.com/kurocha/platform-darwin-ios
+		- clones build-clang from https://github.com/kurocha/build-clang
+		- clones build-darwin from https://github.com/kurocha/build-darwin
+		- clones build-files from https://github.com/kurocha/build-files
+		- clones streams from https://github.com/kurocha/streams
+		- clones generate-template from https://github.com/kurocha/generate-template
+	#<Teapot::Configuration "my-project" visibility=public>
+		- references root from /private/tmp/my-project
+~~~
+
+## Run Tests
+
+Testing is a good idea, and teapot supports test driven development.
+
+~~~ bash
+$ teapot Test/MyProject
+~~~
+
+### Wildcard Targets
+
+To run all tests:
+
+~~~ bash
+$ teapot "Test/*"
+~~~
+
+Provided you are using an environment that supports sanitizers, you can test more thoroughly using:
+
+~~~ bash
+$ teapot "Test/*" variant-sanitize
+~~~
+
+## Run Project
+
+We can now build and run the project executable:
+
+~~~ bash
+$ teapot Run/MyProject
+I'm a little teapot,
+Short and stout,
+Here is my handle (one hand on hip),
+Here is my spout (other arm out with elbow and wrist bent).
+When I get all steamed up,
+Hear me shout,
+Tip me over and pour me out! (lean over toward spout)
+
+                              ~
+                   ___^___   __
+               .- /       \./ /
+              /  /          _/
+              \__|         |
+                  \_______/
+~~~
+
+The resulting executables and libraries will be framework dependent, but are typically located in:
+
+~~~ bash
+$ cd teapot/platforms/development/$PLATFORM-debug/bin
+$ ./$PROJECT_NAME
+~~~
+
+## Cloning Project
+
+You can clone another project which will fetch all dependencies:
+
+~~~ bash
+$ teapot clone https://github.com/kurocha/tagged-format
+$ cd tagged-format
+$ teapot build Executable/TaggedFormat
+~~~

data/context/index.yaml

@@ -0,0 +1,13 @@
+# Automatically generated context index for Utopia::Project guides.
+# Do not edit then files in this directory directly, instead edit the guides and then run `bake utopia:project:agent:context:update`.
+---
+description: Teapot is a tool for managing cross-platform builds.
+metadata:
+  documentation_uri: https://ioquatix.github.io/teapot/
+  funding_uri: https://github.com/sponsors/ioquatix
+  source_code_uri: https://github.com/ioquatix/teapot
+files:
+- path: getting-started.md
+  title: Getting Started
+  description: This guide explains how to use `teapot` to manage cross-platform project
+    dependencies and build systems.

data/lib/teapot/command/build.rb

@@ -1,43 +1,32 @@
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
 
-require_relative 'selection'
+# Released under the MIT License.
+# Copyright, 2017-2026, by Samuel Williams.
 
-require 'build/controller'
+require_relative "selection"
+
+require "build/controller"
 
 module Teapot
 	module Command
+		# Raised when the build fails.
 		class BuildFailedError < StandardError
 		end
 		
+		# A command to build targets in the project.
 		class Build < Selection
 			self.description = "Build the specified target."
 			
 			options do
-				option '-j/-l/--limit <n>', "Limit the build to <n> concurrent processes.", type: Integer
-				option '-c/--continuous', "Run the build graph continually (experimental)."
+				option "-j/-l/--limit <n>", "Limit the build to <n> concurrent processes.", type: Integer
+				option "-c/--continuous", "Run the build graph continually (experimental)."
 			end
 			
 			many :targets, "Build these targets, or use them to help the dependency resolution process."
 			split :argv, "Arguments passed to child process(es) of build if any."
 			
+			# Build the selected targets or default build targets, resolving dependencies and executing the build controller.
+			# @returns [Build::Dependency::Chain] The dependency chain.
 			def call
 				context = parent.context
 				
@@ -51,7 +40,7 @@ module Teapot
 				chain = selection.chain
 				environment = context.configuration.environment
 				
-				controller = ::Build::Controller.new(logger: parent.logger, limit: @options[:limit]) do |controller|
+				controller = ::Build::Controller.new(limit: @options[:limit]) do |controller|
 					controller.add_chain(chain, self.argv, environment)
 				end
 				
@@ -67,7 +56,7 @@ module Teapot
 							if walker.failed?
 								raise BuildFailedError.new("Failed to build all nodes successfully!")
 							end
-						
+							
 							break
 						end
 					end
@@ -80,6 +69,8 @@ module Teapot
 				return chain
 			end
 			
+			# Display task dependencies for debugging, showing which tasks generate which outputs.
+			# @parameter walker [Build::Walker] The build walker.
 			def show_dependencies(walker)
 				outputs = {}
 				

data/lib/teapot/command/clean.rb

@@ -1,30 +1,17 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
 
-require 'samovar'
+# Released under the MIT License.
+# Copyright, 2017-2026, by Samuel Williams.
+
+require "samovar"
 
 module Teapot
 	module Command
+		# A command to clean build artifacts.
 		class Clean < Samovar::Command
 			self.description = "Delete everything in the teapot directory."
 			
+			# Delete build output directories for the specified targets or all targets.
 			def call
 				context = parent.context
 				logger = parent.logger
@@ -32,7 +19,7 @@ module Teapot
 				
 				logger.info "Removing #{configuration.build_path}..."
 				FileUtils.rm_rf configuration.build_path
-			
+				
 				logger.info "Removing #{configuration.packages_path}..."
 				FileUtils.rm_rf configuration.packages_path
 			end

data/lib/teapot/command/clone.rb

@@ -1,44 +1,31 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
 
-require 'samovar'
-require 'build/name'
+# Released under the MIT License.
+# Copyright, 2017-2026, by Samuel Williams.
 
-require_relative 'fetch'
-require 'rugged'
+require "samovar"
+require "build/name"
 
-require 'build/uri'
+require_relative "fetch"
+require "rugged"
+
+require "build/uri"
 
 module Teapot
 	module Command
+		# A command to clone a remote repository and fetch all dependencies.
 		class Clone < Samovar::Command
 			self.description = "Clone a remote repository and fetch all dependencies."
 			
 			one :source, "The source repository to clone.", required: true
 			
+			# Clone packages from their remote repositories using git, parallelizing the operations.
 			def call
 				logger = parent.logger
 				
 				name = File.basename(::Build::URI[@source].path, ".git")
 				
-				nested = parent['--root', parent.options[:root] || name]
+				nested = parent["--root", parent.options[:root] || name]
 				root = nested.root
 				
 				if root.exist?
@@ -52,6 +39,11 @@ module Teapot
 				Fetch[parent: nested].call
 			end
 			
+			# Provide credentials for repository authentication.
+			# @parameter url [String] The repository URL.
+			# @parameter username [String] The username.
+			# @parameter types [Array] The credential types allowed.
+			# @returns [Rugged::Credentials] The credentials object.
 			def credentials(url, username, types)
 				# We should prompt for username/password if required...
 				return Rugged::Credentials::SshKeyFromAgent.new(username: username)

data/lib/teapot/command/create.rb

@@ -1,31 +1,17 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
 
-require 'samovar'
-require 'build/name'
+# Released under the MIT License.
+# Copyright, 2017-2026, by Samuel Williams.
 
-require_relative 'fetch'
-require 'rugged'
+require "samovar"
+require "build/name"
+
+require_relative "fetch"
+require "rugged"
 
 module Teapot
 	module Command
+		# A command to create a new teapot project.
 		class Create < Samovar::Command
 			self.description = "Create a new teapot package using the specified repository."
 			
@@ -33,10 +19,11 @@ module Teapot
 			one :source, "The source repository to use for fetching packages, e.g. https://github.com/kurocha.", required: true
 			many :packages, "Any packages you'd like to include in the project.", default: ["generate-project"]
 			
+			# Create a new project directory structure with default teapot.rb configuration.
 			def call
 				logger = parent.logger
 				
-				nested = parent['--root', parent.options[:root] || name.gsub(/\s+/, '-').downcase]
+				nested = parent["--root", parent.options[:root] || name.gsub(/\s+/, "-").downcase]
 				root = nested.root
 				
 				if root.exist?
@@ -75,10 +62,15 @@ module Teapot
 					tree: index.write_tree(repository),
 					message: "Initial project files.",
 					parents: repository.empty? ? [] : [repository.head.target].compact,
-					update_ref: 'HEAD'
+					update_ref: "HEAD"
 				)
 			end
 			
+			# Generate the initial project files.
+			# @parameter root [Build::Files::Path] The project root path.
+			# @parameter name [String] The project name.
+			# @parameter source [String] The source repository URL.
+			# @parameter packages [Array(String)] The packages to include.
 			def generate_project(root, name, source, packages)
 				name = ::Build::Name.new(name)
 				
@@ -89,17 +81,17 @@ module Teapot
 				
 				# A very basic teapot file to pull in the initial dependencies.
 				File.open(root + TEAPOT_FILE, "w") do |output|
-					output.puts "\# Teapot v#{VERSION} configuration generated at #{Time.now.to_s}", ''
-				
-					output.puts "required_version #{LOADER_VERSION.dump}", ''
+					output.puts "\# Teapot v#{VERSION} configuration generated at #{Time.now.to_s}", ""
+					
+					output.puts "required_version #{LOADER_VERSION.dump}", ""
 					
 					output.puts "define_project #{name.target.dump} do |project|"
 					output.puts "\tproject.title = #{name.text.dump}"
-					output.puts "end", ''
-				
-					output.puts "\# Build Targets", ''
-				
-					output.puts "\# Configurations", ''
+					output.puts "end", ""
+					
+					output.puts "\# Build Targets", ""
+					
+					output.puts "\# Configurations", ""
 					
 					output.puts "define_configuration 'development' do |configuration|"
 					output.puts "\tconfiguration[:source] = #{source.dump}"
@@ -107,7 +99,7 @@ module Teapot
 					packages.each do |name|
 						output.puts "\tconfiguration.require #{name.dump}"
 					end
-					output.puts "end", ''
+					output.puts "end", ""
 					
 					output.puts "define_configuration #{name.target.dump} do |configuration|"
 					output.puts "\tconfiguration.public!"

data/lib/teapot/command/fetch.rb

@@ -1,29 +1,17 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
 
-require_relative 'selection'
-require 'rugged'
+# Released under the MIT License.
+# Copyright, 2017-2026, by Samuel Williams.
+
+require_relative "selection"
+require "rugged"
 
 module Teapot
 	module Command
+		# Raised when a fetch operation fails.
 		class FetchError < StandardError
+			# @parameter package [Package] The package that caused the error.
+			# @parameter message [String] The error message.
 			def initialize(package, message)
 				super(message)
 				@package = package
@@ -32,6 +20,7 @@ module Teapot
 			attr :package
 		end
 		
+		# A command to fetch remote packages and dependencies.
 		class Fetch < Samovar::Command
 			self.description = "Fetch remote packages according to the specified configuration."
 			
@@ -41,16 +30,19 @@ module Teapot
 			# - update packages and update lockfile
 			
 			options do
-				option '--update', "Update dependencies to the latest versions."
-				option '--local', "Don't update from source, assume updated local packages."
+				option "--update", "Update dependencies to the latest versions."
+				option "--local", "Don't update from source, assume updated local packages."
 			end
 			
 			many :packages, "Only update the specified packages, or all packages if none specified."
 			
+			# Get the context for this command.
+			# @returns [Context] The current context.
 			def context
 				parent.context
 			end
 			
+			# Update packages by pulling latest changes from their git remotes, subject to lock file constraints.
 			def call
 				selection = context.select
 				
@@ -77,7 +69,7 @@ module Teapot
 					
 					packages = selection.unresolved
 				end
-			
+				
 				if selection.unresolved.count > 0
 					logger.error(self) do |buffer|
 						buffer.puts "Could not fetch all packages!"
@@ -98,21 +90,21 @@ module Teapot
 				
 				return {
 					commit: repository.head.target.oid,
-					branch: repository.head.name.sub(/^refs\/heads\//, '')
+					branch: repository.head.name.sub(/^refs\/heads\//, "")
 				}
 			end
 			
 			def link_local_package(context, configuration, package, logger)
 				logger.info "Linking local #{package}..." #.color(:cyan)
-		
+				
 				local_path = context.root + package.options[:local]
-
+				
 				# Where we are going to put the package:
 				destination_path = package.path
-
+				
 				# Make the top level directory if required:
 				destination_path.dirname.create
-
+				
 				unless destination_path.exist?
 					destination_path.make_symlink(local_path)
 				end
@@ -133,36 +125,36 @@ module Teapot
 			
 			def clone_or_pull_package(context, configuration, package, package_lock, logger)
 				logger.info "Processing #{package}..." #.color(:cyan)
-
+				
 				# Where we are going to put the package:
 				destination_path = package.path
-
+				
 				base_uri = URI(package.options[:source].to_s)
-
-				if base_uri.scheme == nil || base_uri.scheme == 'file'
+				
+				if base_uri.scheme == nil || base_uri.scheme == "file"
 					base_uri = URI "file://" + File.expand_path(base_uri.path, context.root) + "/"
 				end
-
+				
 				branch_name = package.options[:branch]
-
+				
 				if package_lock
 					logger.info "Package locked to commit: #{package_lock[:branch]}/#{package_lock[:commit]}"
-
+					
 					branch_name = package_lock[:branch]
 					commit_id = package_lock[:commit]
 				end
-
+				
 				if destination_path.exist?
 					logger.info "Updating package at path #{destination_path}..."
-
+					
 					repository = Rugged::Repository.new(destination_path.to_s)
-
+					
 					# Are there uncommitted changes in the work tree?
 					if modified?(repository)
 						raise FetchError.new(package, "Uncommited local modifications")
 					end
 					
-					repository.fetch('origin', credentials: self.method(:credentials))
+					repository.fetch("origin", credentials: self.method(:credentials))
 					repository.checkout(branch_name) if branch_name
 					
 					# Essentially implement git pull:
@@ -194,7 +186,7 @@ module Teapot
 					system("git", "submodule", "update", "--init", "--recursive", chdir: package.path)
 				end
 			end
-
+			
 			def fetch_package(context, configuration, package, logger, update: false, local: false)
 				if package.local?
 					link_local_package(context, configuration, package, logger)