teapot 0.9.0 → 0.9.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTIzOGRjMDQzOGJmOTZmZmE0ODQ0NWU4MzA2YTNiMTJhYWU0YWI4Yg==
+    OTU3OWI1OTkxZTUxMGJjY2FhMmVmZTMyNDQ5OGUxNDcwMDcyNjk1Nw==
   data.tar.gz: !binary |-
-    NTc4YWMzMjdjNjE4M2I0MWUxMmQxYjBhN2NlMmZiMTgwY2NkYThkNQ==
+    ZWVmYzY1OGZjZjkxYzhmNTliOGY1ZjFmZDNiMjBlNTU0OTE4YjkxNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTMxYzQ2Mzg3ODAzOTNiYjBhMDkzOTllOGM1NGE3YjUyNDczMzhkNGNlZWIz
-    MDJhMzUyMDlmNWFhOGM1YzQ3YzBjMDNmNDlhYzVkYjdlNjliOWQ4MzFlZTM5
-    MDY0M2UwMmQzNDI5MmNkOWE0MWZiMjhlNTJiZTE3MTE3ZTkyMjE=
+    YjNmMzFkNGM1NmM2ZGY2ZDE4MDVlNzBlMGZjODExMzU5YzdlNWM3MzEwNjVm
+    MmNlZTc0ZDY3MWU0ZDhhYzc4ZTA2NTFmNjU5NjU3ZTdlZTQ5YjkwM2VlZjU0
+    YmNkOTM2ZDQ3MWU1NjJjM2I5ZDI0MGYzZDEzMmUyYjE5MWI3MzI=
   data.tar.gz: !binary |-
-    OTIxOTIzNWVmZWVhZjMxZDU3OWZlYjk3NzZmOTgwNWE4YzkyYzUyOGNjMGNi
-    ZDIxNWFkYTAwYzQ1ZWZlYzdmY2I2MzU2M2RlMGU4ZDM2OGRhNmNkMWNjM2Rm
-    ODlkYzFiOWJhYjE4ZTEwOTliYTQwOTRhNjE3NDRlMzY0NjI5Mzg=
+    Y2M1NmI5NTY1Y2ZmYmEyMTlhMjRhYTBkY2Q3OGI4YmRkMzdjYmJmYzUxZjMz
+    OTVmOTZjY2JhMmQ1ODQ5ODE0NTM3NmVmY2YzNjc3YzZmZDI2MmE3MzUxYmIx
+    OWVlMzU1ZTk5MWI5ZDFlMDMwZTBjOGQzOWI4NjUzZDEzMDQwMGU=

data/README.md

@@ -8,6 +8,7 @@ Teapot is a decentralised build tool for managing complex cross-platform project
 - The build subsystem provides a simple set of canonical operations for building libraries and executables to minimise configuration overhead.
 
 [![Build Status](https://secure.travis-ci.org/ioquatix/teapot.png)](http://travis-ci.org/ioquatix/teapot)
+[![Code Climate](https://codeclimate.com/github/ioquatix/teapot.png)](https://codeclimate.com/github/ioquatix/teapot)
 
 ## Installation
 

data/bin/teapot

@@ -28,15 +28,20 @@ require 'teapot/controller/fetch'
 require 'teapot/controller/generate'
 require 'teapot/controller/list'
 require 'teapot/controller/run'
+require 'teapot/repository'
 
 require 'time'
 require 'trollop'
 
 OPTIONS = Trollop::options do
+	version "teapot v#{Teapot::VERSION}"
+	
 	opt :only, "Only compiled direct dependencies."
 	opt :in, "Work in the given directory.", :type => :string
 	opt :unlock, "Don't use package lockfile when fetching."
 	
+	opt :force, "Force the operation if it would otherwise be be stopped due to a warning."
+	
 	opt :configuration, "Specify a specific build configuration.", :type => :string
 end
 
@@ -82,16 +87,14 @@ module Application
 		# Make the path:
 		root.mkpath
 		
-		Dir.chdir(root) do
-			Teapot::Commands.run("git", "init")
-		end
+		Teapot::Repository.new(root).init!
 		
 		make_controller(root).create(project_name, source, packages)
 	end
 	
 	def self.generate(arguments = ARGV)
 		generator_name = arguments.shift
-		make_controller.generate(generator_name, arguments)
+		make_controller.generate(generator_name, arguments, OPTIONS[:force])
 	end
 end
 

data/lib/teapot/build/linker.rb

@@ -25,7 +25,7 @@ module Teapot
 		module Linker
 			class UnsupportedPlatform < StandardError
 			end
-			
+
 			def self.link_static(environment, library_file, objects)
 				if RUBY_PLATFORM =~ /darwin/
 					Commands.run(
@@ -33,6 +33,8 @@ module Teapot
 						"-static", "-o", library_file, objects,
 					)
 				elsif RUBY_PLATFORM =~ /linux/
+					FileUtils.rm_rf library_file
+
 					Commands.run(
 						environment[:ar] || 'ar',
 						environment[:arflags] || "-cru",

data/lib/teapot/commands.rb

@@ -22,6 +22,7 @@ require 'set'
 require 'rainbow'
 require 'shellwords'
 require 'facter'
+require 'rexec/task'
 
 module Teapot
 	module Commands
@@ -50,23 +51,25 @@ module Teapot
 			Shellwords.split(arg || "")
 		end
 		
-		def self.run(*args)
+		def self.run(*args, &block)
+			options = Hash === args.last ? args.pop : {}
+			options[:passthrough] ||= :all
+			
 			args = args.flatten.collect &:to_s
 			
-			# Ensure we aren't invoking the shell
-			args[0] = [args[0], args[0]]
+			puts args.join(' ').color(:blue) + " in #{options[:chdir] || Dir.getwd}"
 			
-			puts args.join(' ').color(:blue)
+			task = RExec::Task.open(args, options, &block)
 			
-			if system(*args)
+			if task.wait == 0
 				true
 			else
 				raise CommandError.new("Non-zero exit status: #{args.join(' ')}!")
 			end
 		end
 		
-		def self.run!(*args)
-			run(*args)
+		def self.run!(*args, &block)
+			run(*args, &block)
 		rescue CommandError
 			false
 		end

data/lib/teapot/controller/create.rb

@@ -35,6 +35,10 @@ module Teapot
 			
 				output.puts "required_version #{VERSION.dump}", ''
 			
+				output.puts "\# Build Targets", ''
+			
+				output.puts "\# Configurations", ''
+			
 				output.puts "define_configuration #{name.target.dump} do |configuration|"
 			
 				output.puts "\tconfiguration[:source] = #{source.dump}", ''
@@ -43,7 +47,7 @@ module Teapot
 					output.puts "\tconfiguration.import! #{name.dump}"
 				end
 			
-				output.puts "end"
+				output.puts "end", ''
 			end
 
 			# Fetch all packages:
@@ -57,7 +61,7 @@ module Teapot
 		
 		def generate_project(project_name)
 			if context.generators.key? 'project'
-				generate('project', [project_name])
+				generate('project', [project_name], true)
 			end
 		end
 	end

data/lib/teapot/controller/fetch.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'teapot/controller'
+require 'teapot/repository'
 
 module Teapot
 	class Controller
@@ -108,51 +109,25 @@ module Teapot
 					branch = package_lock[:branch]
 				end
 
+				commit = package_lock ? package_lock[:commit] : nil
+
 				unless destination_path.exist?
 					log "Cloning package at path #{destination_path} ...".color(:cyan)
 			
 					begin
-						destination_path.mkpath
-
 						external_url = package.external_url(context.root)
 
-						Commands.run("git", "clone", external_url, destination_path, "--branch", branch)
-
-						Dir.chdir(destination_path) do
-							# Checkout the specific version if it was given:
-							if package_lock
-								Commands.run("git", "reset", "--hard", package_lock[:commit])
-							end
-
-							Commands.run("git", "submodule", "update", "--init", "--recursive")
-						end
+						Repository.new(destination_path).clone!(external_url, branch, commit)
 					rescue
-						log "Removing incomplete package at path #{destination_path}...".color(:red)
-				
-						# Clean up if the git checkout process is interrupted:
-						destination_path.rmtree
-				
+						log "Failed to clone #{external_url}...".color(:red)
+
 						raise
 					end
 				else
 					log "Updating package at path #{destination_path} ...".color(:cyan)
 
-					Dir.chdir(destination_path) do
-						Commands.run("git", "fetch", "origin")
-		
-						Commands.run("git", "checkout", branch)
-		
-						# Pull any changes, if you might get the error from above:
-						# Your branch is behind 'origin/0.1' by 1 commit, and can be fast-forwarded.
-						Commands.run("git", "pull")
-
-						# Checkout the specific version if it was given:
-						if package_lock
-							Commands.run("git", "reset", "--hard", package_lock[:commit])
-						end
-
-						Commands.run("git", "submodule", "update", "--init", "--recursive")
-					end
+					commit = package_lock ? package_lock[:commit] : nil
+					Repository.new(destination_path).update(branch, commit)
 				end
 				
 				# Lock the package, unless it was already locked:

data/lib/teapot/controller/generate.rb

@@ -22,9 +22,16 @@ require 'teapot/controller'
 
 module Teapot
 	class Controller
-		def generate(name, arguments)
+		def generate(name, arguments, force = false)
 			context.configuration.load_all
 
+			unless force
+				# Check dirty status of local repository:
+				if Repository.new(@root).status.size != 0
+					abort "You have unstaged changes/unadded files. Please stash/commit them before running the generator.".color(:red)
+				end
+			end
+
 			generator = context.generators[name]
 
 			unless generator

data/lib/teapot/generator.rb

@@ -97,17 +97,34 @@ module Teapot
 			end
 		end
 
+		def is_binary(path)
+			if path.exist?
+				return path.read(1024).bytes.find{|byte| byte >= 0 and byte <= 6}
+			else
+				return false
+			end
+		end
+
+		def copy_binary(source_path, destination_path)
+			destination_path.dirname.mkpath
+			FileUtils.cp source_path, destination_path
+		end
+
 		def copy(source, destination, substitutions = nil)
 			source_path = Pathname(path) + source
+			destination_path = Pathname(context.root) + destination
 
 			if source_path.directory?
-				destination_path = Pathname(context.root) + destination
-
 				source_path.children(false).each do |child_path|
 					copy(source_path + child_path, destination_path + substitute(child_path.to_s, substitutions), substitutions)
 				end
 			else
-				merge(source_path, destination, substitutions)
+				if is_binary(source_path) or is_binary(destination)
+					destination_path = Pathname(context.root) + destination
+					copy_binary(source_path, destination_path)
+				else
+					merge(source_path, destination, substitutions)
+				end
 			end
 		end
 	end

data/lib/teapot/name.rb

@@ -37,5 +37,9 @@ module Teapot
 		def macro(prefix = [])
 			(Array(prefix) + [@text]).collect{|name| name.upcase.gsub(/\s+/, '_')}.join('_')
 		end
+		
+		def header_guard(path)
+			macro(path) + '_H'
+		end
 	end
 end

data/lib/teapot/repository.rb

@@ -0,0 +1,106 @@
+# Copyright, 2012, 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.
+
+require 'teapot/commands'
+
+module Teapot
+	module Git
+		class Repository
+			def initialize(root, options = {})
+				@root = root
+				@options = options
+			end
+
+			def init!
+				run!("init", @root)
+			end
+
+			def clone!(remote_url, branch = nil, commit = nil)
+				branch_args = branch ? ["--branch", branch] : []
+
+				@root.mkpath
+
+				run!("clone", remote_url, @root, *branch_args)
+
+				if commit
+					run("reset", "--hard", commit)
+				end
+
+				run("submodule", "update", "--init", "--recursive")
+			rescue
+				#@root.rmtree
+
+				raise
+			end
+
+			def update(branch, commit = nil)
+				run("fetch", "origin")
+				run("checkout", branch)
+
+				# Pull any changes, if you might get the error from above:
+				# Your branch is behind 'origin/0.1' by 1 commit, and can be fast-forwarded.
+				run("pull")
+
+				# Checkout the specific version if it was given:
+				if commit
+					run("reset", "--hard", commit)
+				end
+
+				run("submodule", "update", "--init", "--recursive")
+			end
+
+			def add(files)
+				if files == :all
+					run("add", "--all")
+				else
+					run("add", *files)
+				end
+			end
+
+			def commit(message)
+				run("commit", "-m", message)
+			end
+
+			def status
+				Commands.run("git", "status", "--porcelain", :passthrough => [:in, :err]) do |task|
+					if task.wait == 0
+						return task.output.readlines.collect{|line| line.chomp.split(/\s+/, 2)}
+					end
+				end
+			end
+
+			private
+
+			def run(*args)
+				Commands.run("git", *args, :chdir => @root)
+			end
+
+			def run!(*args)
+				Commands.run("git", *args)
+			end
+		end
+	end
+
+	module Repository
+		def self.new(*args)
+			Git::Repository.new(*args)
+		end
+	end
+end

data/lib/teapot/substitutions.rb

@@ -52,8 +52,8 @@ module Teapot
 	end
 	
 	class Substitutions
-		def initialize
-			@ordered = []
+		def initialize(ordered = [])
+			@ordered = ordered
 		end
 		
 		def []= keyword, value
@@ -69,6 +69,10 @@ module Teapot
 			@ordered << substition
 		end
 
+		def + other
+			Substitutions.new(@ordered + other.ordered)
+		end
+
 		attr :ordered
 
 		def call(text)
@@ -198,5 +202,22 @@ module Teapot
 				return text
 			end
 		end
+		
+		# Create a set of substitutions from the given context which includes a set of useful defaults.
+		def self.for_context(context)
+			substitutions = self.new
+
+			# The user's current name:
+			substitutions['AUTHOR_NAME'] = `git config --global user.name`.chomp
+
+			substitutions['PROJECT_NAME'] = context.project.name
+			substitutions['LICENSE'] = context.project.license
+
+			current_date = Time.new
+			substitutions['DATE'] = current_date.strftime("%-d/%-m/%Y")
+			substitutions['YEAR'] = current_date.strftime("%Y")
+
+			return substitutions
+		end
 	end
 end

data/lib/teapot/version.rb

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

data/teapot.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
 	the infusions ecosystem of packages and platform tooling.
 	EOF
 	gem.summary       = %q{Teapot is a tool for managing complex cross-platform builds.}
-	gem.homepage      = ""
+	gem.homepage      = "http://www.kyusu.org"
 
 	gem.files         = `git ls-files`.split($/)
 	gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -124,6 +124,7 @@ files:
 - lib/teapot/name.rb
 - lib/teapot/package.rb
 - lib/teapot/project.rb
+- lib/teapot/repository.rb
 - lib/teapot/substitutions.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
@@ -133,7 +134,7 @@ files:
 - test/test_environment.rb
 - test/test_substitutions.rb
 - test/test_teapot.rb
-homepage: ''
+homepage: http://www.kyusu.org
 licenses: []
 metadata: {}
 post_install_message: