tug 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccbf76dce88befc9a05e706971318dd2f2112b87
-  data.tar.gz: b29d2ff15d5c65d7a9911cf37682be61f8e8292f
+  metadata.gz: 9710a9c58ba0148c3f554af14898d4de0b966091
+  data.tar.gz: 35c8f0df420da37a7e73253e8c4df76aa38e82ff
 SHA512:
-  metadata.gz: 4d9b5bedcc1d106d8fceb1459fc5fef1a89a83132ad2866aadb6a7e98b9a4747ada8b7d9c91ad033e3d64374f11ec4cb12fc1842724f8dc7f913db206b467339
-  data.tar.gz: 12d1971bc4a41a5a160cb80472a9b61ec3b305217476f031fcd8caa11c9521c09f5f1eff64000e00bb89173ab627f731f806642ebcde8023b54d4de882d2a53f
+  metadata.gz: baa1543c98c85d75f0f7cab80bcf1ab80afc9929e196e30213396f6f3467bb48c6a4ec17c2cac48c988546ff67ec04bbbaccd0a8f30e058637efd18baff8a527
+  data.tar.gz: b585022d3be40b825802081c9127ca4feffc9c4e198c357f4d0fa0ecfb48048f0157f1f8769c60c165cd0d0affc7007acc8aa332f2e33d6b5cb8e40af9456ce4

data/bin/tug

@@ -1,5 +1,5 @@
+#!/usr/bin/env ruby
+
 require "tug"
 
-parser = Parser.parser_for_args(*ARGV)
-command = Command.command_for_string(parser.command)
-command.execute(parser.options)
+Tug::Interface.start(ARGV)

data/lib/tug/command/build_command.rb

@@ -1,13 +1,10 @@
-class BuildCommand < Command
+module Tug
+  class BuildCommand < Command
 
-  def execute(options)
-    config_file = ConfigFile.config_file(options[:config])
-    build(config_file.project)
-  end
-
-  def build(project)
-    project.schemes.each do |scheme|
-      system("xctool -workspace #{project.workspace} -scheme #{scheme} -sdk iphonesimulator")
+    def execute(project)
+      project.schemes.each do |scheme|
+        system("xctool -workspace #{project.workspace} -scheme #{scheme} -sdk iphonesimulator")
+      end
     end
   end
 end

data/lib/tug/command/command.rb

@@ -1,16 +1,18 @@
-class Command
+module Tug
+  class Command
 
-  class << self
-    def command_for_string(command_string)
-      case command_string
-      when "build"
-        BuildCommand.new
-      else
-        Command.new
+    class << self
+      def command_for_string(command_string)
+        case command_string
+        when "build"
+          Tug::BuildCommand.new
+        else
+          Tug::Command.new
+        end
       end
     end
-  end
 
-  def execute(options)
+    def execute(project)
+    end
   end
 end

data/lib/tug/config/config_file.rb

@@ -1,28 +1,30 @@
-class ConfigFile
+module Tug
+  class ConfigFile
 
-  attr_reader :project
+    attr_reader :project
 
-  class << self
-    def config_file(path=nil)
-      if path and File.file?(path)
-        ExternalConfigFile.new(path)
-      elsif File.file?(File.join(Dir.pwd, '.tug.yml'))
-        ConfigFile.new
-      else
-        MissingConfigFile.new
+    class << self
+      def config_file(path=nil)
+        if path and File.file?(path)
+          Tug::ExternalConfigFile.new(path)
+        elsif File.file?(File.join(Dir.pwd, '.tug.yml'))
+          Tug::ConfigFile.new
+        else
+          Tug::MissingConfigFile.new
+        end
       end
     end
-  end
 
-  def initialize(path=nil)
-    config = YAML::load_file(File.join(Dir.pwd, '.tug.yml'))
-    @project = project_from_config(config)
-  end
+    def initialize(path=nil)
+      config = YAML::load_file(File.join(Dir.pwd, '.tug.yml'))
+      @project = project_from_config(config)
+    end
 
-  private
+    private
 
-  def project_from_config(config)
-    project_yaml = config['project']
-    Project.new(project_yaml['workspace'], project_yaml['schemes'])
+    def project_from_config(config)
+      project_yaml = config['project']
+      Tug::Project.new(project_yaml['workspace'], project_yaml['schemes'])
+    end
   end
 end

data/lib/tug/config/external_config_file.rb

@@ -1,6 +1,8 @@
-class ExternalConfigFile < ConfigFile
+module Tug
+  class ExternalConfigFile < ConfigFile
 
-  def initialize(path=nil)
-    @config = YAML::load_file(path)
+    def initialize(path=nil)
+      @config = YAML::load_file(path)
+    end
   end
 end

data/lib/tug/config/missing_config_file.rb

@@ -1,14 +1,16 @@
-class MissingConfigFile < ConfigFile
+module Tug
+  class MissingConfigFile < ConfigFile
 
-  def initialize(path=nil)
-    puts "Config file missing 😱\n" +
-    "Try specifying a path to your config with the -c option"
-    abort
-  end
+    def initialize(path=nil)
+      puts "Config file missing:\n" +
+      "  Try specifying a path to your config file with the --config option"
+      abort
+    end
 
-  private
+    private
 
-  def abort
-    exit 1
+    def abort
+      exit 1
+    end
   end
 end

data/lib/tug/interface/interface.rb

@@ -0,0 +1,18 @@
+module Tug
+  class Interface < Thor
+
+    desc "build", "build a project"
+    option :config
+    def build
+      config_file = Tug::ConfigFile.config_file(options[:config])
+      execute(__method__.to_s, config_file.project)
+    end
+
+    no_commands do
+      def execute(command, project)
+        command = Tug::Command.command_for_string(command)
+        command.execute(project)
+      end
+    end
+  end
+end

data/lib/tug/project/project.rb

@@ -1,10 +1,12 @@
-class Project
+module Tug
+  class Project
 
-  attr_reader :schemes
-  attr_reader :workspace
+    attr_reader :schemes
+    attr_reader :workspace
 
-  def initialize(workspace, schemes)
-    @schemes = schemes
-    @workspace = workspace
+    def initialize(workspace, schemes)
+      @schemes = schemes
+      @workspace = workspace
+    end
   end
 end

data/lib/tug/version.rb

@@ -1,3 +1,3 @@
 module Tug
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tug.rb

@@ -1,13 +1,13 @@
 require "optparse"
 require 'yaml'
+require 'thor'
 
 require "tug/version"
 
 require "tug/command/command"
 require "tug/command/build_command"
 
-require "tug/parser/parser"
-require "tug/parser/empty_parser"
+require "tug/interface/interface"
 
 require "tug/config/config_file"
 require "tug/config/missing_config_file"

data/spec/build_command_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
-describe BuildCommand do
+describe Tug::BuildCommand do
 
   describe "when executing" do
 
     before(:each) do
-      @buld_command = BuildCommand.new
-      @project = Project.new('workspace', ['scheme'])
+      @build_command = Tug::BuildCommand.new
+      @project = Tug::Project.new('workspace', ['scheme'])
     end
 
     it "should run xctool" do
-      expect(@buld_command).to receive(:system).with(/xctool/)
-      @buld_command.build(@project)
+      expect(@build_command).to receive(:system).with(/xctool/)
+      @build_command.execute(@project)
     end
 
     it "should set the workspace" do
-      expect(@buld_command).to receive(:system).with(/-workspace workspace/)
-      @buld_command.build(@project)
+      expect(@build_command).to receive(:system).with(/-workspace workspace/)
+      @build_command.execute(@project)
     end
 
     it "should set the scheme" do
-      expect(@buld_command).to receive(:system).with(/-scheme scheme/)
-      @buld_command.build(@project)
+      expect(@build_command).to receive(:system).with(/-scheme scheme/)
+      @build_command.execute(@project)
     end
   end
 end

data/spec/command_spec.rb

@@ -1,20 +1,20 @@
 require "spec_helper"
 
-describe Command do
+describe Tug::Command do
 
   before :each do
-    @command = Command.new
+    @command = Tug::Command.new
   end
 
   describe "when returning a command" do
     it "should return a build command" do
-      command = Command.command_for_string("build")
-      expect(command).to be_kind_of(BuildCommand)
+      command = Tug::Command.command_for_string("build")
+      expect(command).to be_kind_of(Tug::BuildCommand)
     end
 
     it "should return a default command" do
-      command = Command.command_for_string("hello")
-      expect(command).to be_kind_of(Command)
+      command = Tug::Command.command_for_string("hello")
+      expect(command).to be_kind_of(Tug::Command)
     end
   end
 end

data/spec/config_file_spec.rb

@@ -1,31 +1,31 @@
 require "spec_helper"
 
-describe ConfigFile do
+describe Tug::ConfigFile do
 
   before(:each) do
     config = {'project' => {'workspace' => 'hello', 'schemes' => ["world"]}}
     allow(YAML).to receive(:load_file).and_return(config)
-    @config_file = ConfigFile.new
+    @config_file = Tug::ConfigFile.new
   end
 
   describe "when returning a config file" do
     it "should return a config file for no path" do
       expect(File).to receive(:file?).and_return(true)
-      config_file = ConfigFile.config_file
-      expect(config_file).to be_kind_of(ConfigFile)
+      config_file = Tug::ConfigFile.config_file
+      expect(config_file).to be_kind_of(Tug::ConfigFile)
     end
 
     it "should return a missing config file for no file found" do
-      allow_any_instance_of(MissingConfigFile).to receive(:abort)
+      allow_any_instance_of(Tug::MissingConfigFile).to receive(:abort)
       expect(File).to receive(:file?).and_return(false)
-      config_file = ConfigFile.config_file
-      expect(config_file).to be_kind_of(MissingConfigFile)
+      config_file = Tug::ConfigFile.config_file
+      expect(config_file).to be_kind_of(Tug::MissingConfigFile)
     end
 
     it "should return an external config file for a path" do
       allow(File).to receive(:file?).and_return(true)
-      config_file = ConfigFile.config_file("path")
-      expect(config_file).to be_kind_of(ExternalConfigFile)
+      config_file = Tug::ConfigFile.config_file("path")
+      expect(config_file).to be_kind_of(Tug::ExternalConfigFile)
     end
   end
 

data/spec/output.txt

@@ -0,0 +1,2 @@
+Config file missing:
+  Try specifying a path to your config file with the --config option

data/spec/project_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Project do
+describe Tug::Project do
 
   describe "when created" do
 
     before(:each) do
-      @project = Project.new("workspace", ["scheme"])
+      @project = Tug::Project.new("workspace", ["scheme"])
     end
 
     it "should have a workspace" do

data/tug.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "thor"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tug
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alex Fish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,15 +105,13 @@ files:
 - lib/tug/config/config_file.rb
 - lib/tug/config/external_config_file.rb
 - lib/tug/config/missing_config_file.rb
-- lib/tug/parser/empty_parser.rb
-- lib/tug/parser/parser.rb
+- lib/tug/interface/interface.rb
 - lib/tug/project/project.rb
 - lib/tug/version.rb
 - spec/build_command_spec.rb
 - spec/command_spec.rb
 - spec/config_file_spec.rb
 - spec/output.txt
-- spec/parser_spec.rb
 - spec/project_spec.rb
 - spec/spec_helper.rb
 - tug.gemspec
@@ -132,6 +144,5 @@ test_files:
 - spec/command_spec.rb
 - spec/config_file_spec.rb
 - spec/output.txt
-- spec/parser_spec.rb
 - spec/project_spec.rb
 - spec/spec_helper.rb

data/lib/tug/parser/empty_parser.rb

@@ -1,12 +0,0 @@
-class EmptyParser < Parser
-
-  def initialize(*options)
-    super([])
-  end
-
-  private
-
-  def parsed_options(*options)
-    puts banner
-  end
-end

data/lib/tug/parser/parser.rb

@@ -1,47 +0,0 @@
-class Parser
-
-  attr_reader :options
-  attr_reader :command
-
-  class << self
-    def parser_for_args(*options)
-      if options.size > 0
-        Parser.new(*options)
-      else
-        EmptyParser.new
-      end
-    end
-  end
-
-  def initialize(*options)
-    @command = options.shift
-    @options = parsed_options(*options)
-  end
-
-  private
-
-  def banner
-    "\n" +
-    "Commands:\n" +
-    " build - Build an xcode project\n\n" +
-    "Options:\n" +
-    " --config - Path to a .tug.yml config file"
-  end
-
-  def parsed_options(*options)
-    parsed_options = {}
-
-    o = OptionParser.new do |opts|
-      opts.on("-c", "--config CONFIG", "Configuration file path") do |config|
-        parsed_options[:config] = config
-      end
-    end
-
-    begin o.parse! options
-    rescue OptionParser::InvalidOption => e
-      puts banner
-    end
-
-    parsed_options
-  end
-end

data/spec/parser_spec.rb

@@ -1,27 +0,0 @@
-require "spec_helper"
-
-describe Parser do
-  describe "when returning parsers" do
-    it "should return an option parser for options" do
-      parser = Parser.parser_for_args(["options"])
-      expect(parser).to be_a_kind_of(Parser)
-    end
-
-    it "should return an empty option parser for no options" do
-      parser = Parser.parser_for_args
-      expect(parser).to be_a_kind_of(EmptyParser)
-    end
-  end
-
-  describe "when parsing options" do
-    it "should parse the command" do
-      parser = Parser.parser_for_args("build")
-      expect(parser.command).to match("build")
-    end
-
-    it "should parse the config file option" do
-      parser = Parser.new("build", "-c", "path")
-      expect(parser.options[:config]).to match("path")
-    end
-  end
-end