teapot 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4b9985b5523ab61e6016f73b9d1a7de0a424317
-  data.tar.gz: f699a936b8c6f38b761b80902c628ba054eaa8c1
+  metadata.gz: b4d8190d7c6fa80774a4dc2395bf8afd49605de7
+  data.tar.gz: 5414eda9fba4aa24848fa61e33251dd76ec06679
 SHA512:
-  metadata.gz: 5da3b8ebc748e36b9bedc8731c6c42c5e783061bc30dc3f77f003af4001b7f8076ee5b9cebd4154325af554a4125cba6e12c308419a4688935b277bd589ca7a6
-  data.tar.gz: 14f418012735d4e469f919779ed8c5ab4f7048ac33cf0357ae7d8f6f7603e0699b29a41021389a982e6401c8a649a05ded1539bc90954ca9459c2aba8a8211ba
+  metadata.gz: 0ae6edbfbab5bcf88d745e845d5b940a7214945bb38689b71cec621bdbe16f33fdfd2a74a97c1b29becd0a1fb93100e256a268675e37be10931065ab59bacc4f
+  data.tar.gz: 69e7f188c5c01771f968fe974ff6c19f85d71dfbd513e89be0b28b9e9606f38ca0e7af2d9ddaf065c5e764ad54606e8649ea1a9d757276c18c208f2c7e82bd60

data/bin/teapot

@@ -20,84 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
-require 'teapot/controller/build'
-require 'teapot/controller/clean'
-require 'teapot/controller/create'
-require 'teapot/controller/fetch'
-require 'teapot/controller/generate'
-require 'teapot/controller/list'
-require 'teapot/controller/visualize'
-
-require 'teapot/repository'
-
+require 'teapot/command'
 require 'time'
-require 'trollop'
-
-def make_controller(root = nil)
-	root ||= OPTIONS[:in] || Dir.getwd
-	Teapot::Controller.new(root, OPTIONS)
-end
-
-# It would be nice to make this code a bit simpler, perhaps moving some parts of it to lib/teapot/application/{function}.rb
-module Application
-	def self.clean
-		make_controller.clean
-	end
-	
-	def self.fetch
-		make_controller.fetch
-	end
-	
-	def self.build(targets = ARGV.slice!(0..-1))
-		make_controller.build(targets)
-	end
-	
-	def self.exec(target = ARGV.shift)
-		make_controller.build([target])
-	end
-	
-	def self.list(only = ARGV)
-		if only.size > 0
-			make_controller.list(Set.new(only))
-		else
-			make_controller.list
-		end
-	end
-	
-	def self.visualize(targets = ARGV)
-		make_controller.visualize(targets)
-	end
-	
-	def self.create
-		project_name = ARGV.shift
-		project_directory = project_name.gsub(/\s+/, '-').downcase
-		source = ARGV.shift
-		packages = ARGV.slice!(0..-1)
-		
-		root = Build::Files::Path.join(Dir.getwd, project_directory)
-		
-		if root.exist?
-			abort "#{root} already exists!".color(:red)
-		end
-		
-		# Make the path:
-		root.create
-		
-		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, OPTIONS[:force])
-	end
-end
-
-def valid_actions
-	(Application.public_methods - Module.methods).collect(&:to_s)
-end
 
 def track_time
 	start_time = Time.now
@@ -111,9 +35,20 @@ ensure
 	$stderr.puts Rainbow("Elapsed Time: %0.3fs" % elapsed_time).magenta
 end
 
-OPTIONS = Trollop::options do
+def parse_argv
+	if split_index = ARGV.index('--')
+		ARGV.shift(split_index).tap{ARGV.shift}
+	else
+		ARGV.slice!(0..-1)
+	end
+end
+
+# Get the arguments up until "--"
+ARGUMENTS = parse_argv
+
+OPTIONS = Trollop::options(ARGUMENTS) do
 	banner Rainbow("Teapot: a decentralised package manager and build tool.").bright.blue
-	version "teapot v#{Teapot::VERSION}"
+	version "teapot #{Teapot::VERSION}"
 	
 	opt :configuration, "Specify a specific build configuration.", :type => :string
 	
@@ -122,29 +57,20 @@ OPTIONS = Trollop::options do
 	opt :only, "Only compiled direct dependencies."
 	opt :continuous, "Run the build graph continually (experimental).", :type => :boolean, :short => :n
 	
-	opt :in, "Work in the given directory.", :type => :string
+	opt :in, "Work in the given directory.", :type => :string, :default => Dir.getwd
 	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 :verbose, "Verbose output and error backtraces.", :type => :boolean
-	opt :version, "Print version and exit", :short => :none
 	
+	opt :version, "Print version and exit", :short => :none
 	opt :help, "Show this message"
 end
 
-action = ARGV.shift
-
-# Check that the command was invoked correctly...
-unless action and valid_actions.include?(action)
-	puts "You must specify an action from: #{valid_actions.join(', ')}".color(:red)
-	
-	exit -1
-end
-
 track_time do
 	begin
-		Application.send(action.to_sym)
+		Teapot::Command.new(ARGUMENTS, OPTIONS).invoke
 	rescue Teapot::IncompatibleTeapotError => error
 		$stderr.puts error.message.color(:red)
 		$stderr.puts "Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."

data/lib/teapot/command.rb

@@ -0,0 +1,106 @@
+# 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.
+
+require_relative 'controller'
+require_relative 'controller/build'
+require_relative 'controller/clean'
+require_relative 'controller/create'
+require_relative 'controller/fetch'
+require_relative 'controller/generate'
+require_relative 'controller/list'
+require_relative 'controller/visualize'
+
+require_relative 'repository'
+
+require 'trollop'
+
+module Teapot
+	# This module implements all top-level teapot commands.
+	class Command
+		def initialize(arguments, options)
+			@action, *@arguments = arguments
+			@options = options
+		end
+		
+		def controller(root = nil)
+			Teapot::Controller.new(root || @options[:in], @options)
+		end
+		
+		def invoke
+			if @action == "invoke"
+				fail "The meaning of life is 42."
+			end
+			
+			self.send(@action)
+		end
+		
+		def clean
+			controller.clean
+		end
+		
+		def fetch
+			controller.fetch
+		end
+		
+		def list
+			only = nil
+			
+			if @arguments.any?
+				only = Set.new(@arguments)
+			end
+			
+			controller.list(only)
+		end
+		
+		def generate
+			generator_name, *arguments = @arguments
+			
+			controller.generate(generator_name, arguments, @options[:force])
+		end
+		
+		def build
+			controller.build(@arguments)
+		end
+		
+		alias brew build
+		
+		def visualize
+			controller.visualize(@arguments)
+		end
+		
+		def create
+			project_name, source, *packages = @arguments
+			project_path = @options.fetch(:in) {project_name.gsub(/\s+/, '-').downcase}
+			
+			root = Build::Files::Path.join(Dir.getwd, project_path)
+			
+			if root.exist?
+				abort "#{root} already exists!".color(:red)
+			end
+			
+			# Make the path:
+			root.create
+			
+			Teapot::Repository.new(root).init!
+			
+			controller(root).create(project_name, source, packages)
+		end
+	end
+end

data/lib/teapot/context.rb

@@ -18,10 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/loader'
-require 'teapot/package'
+require_relative 'loader'
+require_relative 'package'
+require_relative 'metadata'
 
-require 'teapot/metadata'
 require 'build/rulebook'
 
 module Teapot

data/lib/teapot/controller.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/configuration'
-require 'teapot/version'
+require_relative 'configuration'
+require_relative 'version'
 
 require 'uri'
 require 'rainbow'

data/lib/teapot/controller/build.rb

@@ -18,10 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
+require_relative '../controller'
 require 'build/controller'
 
-
 module Teapot
 	class Controller
 		class BuildFailedError < StandardError

data/lib/teapot/controller/clean.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
+require_relative '../controller'
 
 module Teapot
 	class Controller

data/lib/teapot/controller/create.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
-require 'teapot/controller/fetch'
+require_relative '../controller'
+require_relative 'fetch'
 
 require 'build/name'
 

data/lib/teapot/controller/fetch.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
-require 'teapot/repository'
+require_relative '../controller'
+require_relative '../repository'
 
 module Teapot
 	class Controller

data/lib/teapot/controller/generate.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
+require_relative '../controller'
 
 module Teapot
 	class Controller

data/lib/teapot/controller/list.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
+require_relative '../controller'
 
 module Teapot
 	class Controller

data/lib/teapot/controller/visualize.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/controller'
+require_relative '../controller'
 
 require 'graphviz'
 require 'yaml'

data/lib/teapot/generator.rb

@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/definition'
-require 'teapot/substitutions'
-require 'teapot/merge'
+require_relative 'definition'
+require_relative 'substitutions'
+require_relative 'merge'
 
 require 'tempfile'
 

data/lib/teapot/loader.rb

@@ -18,10 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/project'
-require 'teapot/target'
-require 'teapot/generator'
-require 'teapot/configuration'
+require_relative 'project'
+require_relative 'target'
+require_relative 'generator'
+require_relative 'configuration'
 
 require 'build/rule'
 require 'build/name'

data/lib/teapot/package.rb

@@ -20,8 +20,8 @@
 
 require 'build/files'
 
-require 'teapot/context'
-require 'teapot/definition'
+require_relative 'context'
+require_relative 'definition'
 
 module Teapot
 	Path = Build::Files::Path

data/lib/teapot/project.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/definition'
+require_relative 'definition'
 
 module Teapot
 	class Project < Definition

data/lib/teapot/target.rb

@@ -19,8 +19,8 @@
 # THE SOFTWARE.
 
 require 'pathname'
-require 'teapot/dependency'
-require 'teapot/definition'
+require_relative 'dependency'
+require_relative 'definition'
 
 require 'build/environment'
 require 'build/rulebook'

data/lib/teapot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -143,6 +143,7 @@ files:
 - Rakefile
 - bin/teapot
 - lib/teapot.rb
+- lib/teapot/command.rb
 - lib/teapot/configuration.rb
 - lib/teapot/context.rb
 - lib/teapot/controller.rb
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.