swift-gist 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07dc7f889af55eb6a518f8bf00e6f86bb83d5702
-  data.tar.gz: fcd36b11560ffd97fe8365e7397c2b8ea9a331c9
+  metadata.gz: 0ce8536fe946be19b7b6f904f8b24fd884b0d7a8
+  data.tar.gz: 5fbc98be03c1be06a726e87ba4c8535fa33600c2
 SHA512:
-  metadata.gz: 0312a7227f6f66da89ec6223f221b4eb0dfe8d575ecdc3f731669eac79b67e0ab71413c81fa03fb475e54de9db974f8dfc3c0f0d3cb2e39c7824e17f542b29af
-  data.tar.gz: 622b8e3935c07d9ca07e0d93ac06ba23bba5e935ae9f9366ca63f77955981a7280f6b58c7b3526b36bb4c6974414084d68c4bd39643f047f1544994b8daad52e
+  metadata.gz: 82dbb712dbc77a88db8a355e2f3aebf6d9fd33954cb2d15e31d6f57302847fdb3b16d6f706e4e2c45662d55d7ad70c84617696c22ec4ae07880b2031cad6be0c
+  data.tar.gz: 69bc72e5d7cd2111fbd060254db10f89bd28b9fdfe77987caf9692832f02f8f1e624ae27cfa2fe9654aaeb868fddd30a5635662593d55c88b7eaeeea0a0011d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swift-gist (0.0.2)
+    swift-gist (0.0.3)
       listen (~> 3.1.5)
 
 GEM

data/bin/swift-gist

@@ -2,7 +2,11 @@
 
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
-require "bundler/setup"
 require "swift/gist"
 
+trap "SIGINT" do
+  puts "Exiting"
+  exit
+end
+
 exit Swift::Gist::run(ARGV)

data/lib/swift/gist/cli.rb

@@ -2,11 +2,27 @@ require 'optparse'
 
 module Swift
   module Gist
+    class CLIError < StandardError
+      attr_accessor :reason
+
+      def initialize reason
+        self.reason = reason
+      end
+    end
 
     # The CLI creates a new module for every `--module` or `--test-module`
     # argument. The `--source` and `--depends-on` arguments are all applied
     # to the last defined swift module.
     def self.parse_command_line_arguments arguments
+      unless arguments.count > 0
+        error = CLIError.new(<<REASON
+Usage: swift-gist [--module[=<name>]] [--test-module[=<name>]]
+                  [--source[=<glob>]] [--depends-on[=<module name>]]
+REASON
+)
+        raise error
+      end
+
       swift_modules = []
 
       OptionParser.new do |parser|
@@ -15,6 +31,10 @@ module Swift
         end
 
         parser.on('--source SOURCE') do |source|
+          if swift_modules.last.nil?
+            raise CLIError.new("Error: The `--source` argument requires that a `--module` or `--test-module` has already been defined.")
+          end
+
           swift_modules.last.sources |= Dir[source]
         end
 
@@ -23,10 +43,19 @@ module Swift
         end
 
         parser.on('--depends-on MODULE') do |module_name|
+          if swift_modules.last.nil?
+            raise CLIError.new("Error: The `--depends-on` argument requires that a `--module` or `--test-module` has already been defined.")
+          end
           swift_modules.last.depends_on << module_name
         end
       end.parse arguments
 
+      swift_modules.each do |swift_module|
+        if swift_module.sources.count == 0
+          raise CLIError.new("Error: The module '#{swift_module.name}' does not have any valid sources.")
+        end
+      end
+
       swift_modules
     end
 

data/lib/swift/gist/{watcher.rb → file_watcher.rb}

@@ -2,7 +2,7 @@ require 'listen'
 
 module Swift
   module Gist
-    def self.watch_sources swift_modules, listener: Listen, sleep: method(:sleep)
+    def self.watch_sources swift_modules, listener: Listen
       sources = Set.new(swift_modules.map { |swift_module| swift_module.sources }.flatten)
       dirs    = Set.new(sources.map { |path| Dir.exist?(path) ? path : File.dirname(path) })
 
@@ -10,8 +10,6 @@ module Swift
         next unless sources.intersect?(Set.new(modified + created + deleted))
         yield
       end.start
-
-      sleep.call
     end
   end
 end

data/lib/swift/gist/runner.rb

@@ -17,33 +17,46 @@ module Swift
       project_art_generator: method(:generate_project_art),
       project_generator: method(:generate_project),
       rm_rf: FileUtils.method(:rm_rf),
-      system: method(:system),
+      stdin_watcher: method(:watch_stdin),
       stdout: $stdout.method(:puts),
+      system: method(:system),
       watcher: method(:watch_sources)
     )
 
-      swift_modules = cli.call arguments
-      tmp_dir = project_generator.call(swift_modules)
-      stdout.call project_art_generator.call(swift_modules, tmp_dir)
-
-      chdir.call(tmp_dir) do
-        system.call('swift test')
+      begin
+        swift_modules = cli.call arguments
+      rescue CLIError => error
+        puts error.reason
+        exit
       end
 
-      counter = 1
-      watcher.call(swift_modules) do
-        stdout.call "\n\n-----> Running `$ swift test` @ '#{formatted_date.call}' - Build ##{counter}"
+      begin
+        tmp_dir = project_generator.call(swift_modules)
+        stdout.call project_art_generator.call(swift_modules, tmp_dir)
+
         chdir.call(tmp_dir) do
           system.call('swift test')
         end
 
-        counter += 1
+        counter = 1
+
+        build_command = -> {
+          stdout.call "\n\n-----> Running `$ swift test` @ '#{formatted_date.call}' - Build ##{counter}"
+          chdir.call(tmp_dir) do
+            system.call('swift test')
+          end
+
+          counter += 1
+        }
+
+        watcher.call(swift_modules, &build_command)
+        stdin_watcher.call(&build_command)
+
+      ensure
+        rm_rf.call tmp_dir
       end
 
       0
-
-    ensure
-      rm_rf.call tmp_dir
     end
 
   end

data/lib/swift/gist/stdin_watcher.rb

@@ -0,0 +1,11 @@
+module Swift
+  module Gist
+
+    def self.watch_stdin stdin: STDIN
+      while stdin.gets
+        yield
+      end
+    end
+
+  end
+end

data/lib/swift/gist/version.rb

@@ -1,5 +1,5 @@
 module Swift
   module Gist
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/swift/gist.rb

@@ -4,12 +4,13 @@ module Swift
 end
 
 require "swift/gist/cli"
+require "swift/gist/file_watcher"
 require "swift/gist/format_swift_module"
 require "swift/gist/generate_project"
 require "swift/gist/generate_project_art"
 require "swift/gist/runner"
 require "swift/gist/spm_package_creator"
 require "swift/gist/spm_project_creator"
+require "swift/gist/stdin_watcher"
 require "swift/gist/swift_module"
 require "swift/gist/version"
-require "swift/gist/watcher"

data/swift-gist.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>=2.3.3'
 
   spec.add_runtime_dependency 'listen', '~> 3.1.5'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift-gist
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Paul Samuels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -99,15 +99,16 @@ files:
 - bin/swift-gist
 - lib/swift/gist.rb
 - lib/swift/gist/cli.rb
+- lib/swift/gist/file_watcher.rb
 - lib/swift/gist/format_swift_module.rb
 - lib/swift/gist/generate_project.rb
 - lib/swift/gist/generate_project_art.rb
 - lib/swift/gist/runner.rb
 - lib/swift/gist/spm_package_creator.rb
 - lib/swift/gist/spm_project_creator.rb
+- lib/swift/gist/stdin_watcher.rb
 - lib/swift/gist/swift_module.rb
 - lib/swift/gist/version.rb
-- lib/swift/gist/watcher.rb
 - swift-gist.gemspec
 homepage: https://github.com/paulsamuels/swift-gist
 licenses:
@@ -121,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="