shanty 0.1.0 → 0.2.0

data/lib/shanty/mutator.rb

@@ -8,15 +8,22 @@ module Shanty
       attr_reader :mutators
     end
 
+    attr_reader :env, :graph
+
+    def initialize(env, graph)
+      @env = env
+      @graph = graph
+    end
+
     def self.inherited(mutator)
       Util.logger.debug("Detected mutator #{mutator}")
       @mutators ||= []
       @mutators << mutator
     end
 
-    def apply_mutations(graph)
-      self.class.mutators.reduce(graph) do |acc, mutator|
-        mutator.new.mutate(acc)
+    def apply_mutations
+      self.class.mutators.each do |mutator|
+        mutator.new(@env, @graph).mutate
       end
     end
   end

data/lib/shanty/mutators/bundler.rb

@@ -0,0 +1,13 @@
+require 'shanty/mutator'
+require 'shanty/plugins/bundler'
+
+module Shanty
+  # Bundler mutator
+  class BundlerMutator < Mutator
+    def mutate
+      graph.each do |project|
+        BundlerPlugin.add_to_project(project) if File.exist?(File.join(project.path, 'Gemfile'))
+      end
+    end
+  end
+end

data/lib/shanty/mutators/changed.rb

@@ -0,0 +1,78 @@
+require 'find'
+require 'fileutils'
+require 'set'
+require 'shanty/mutator'
+
+module Shanty
+  # Mutates the graph to mark projects which have changed since the last time they were built.
+  class ChangedMutator < Mutator
+    UNIT_SEPARATOR = "\u001F"
+
+    def mutate
+      FileUtils.mkdir(shanty_dir) unless File.directory?(shanty_dir)
+
+      self.cached_index = all_index_files.each_with_object({}) do |path, acc|
+        # Check if the file has changed between
+        next if unchanged_in_index?(path)
+        # Otherwise, it was modified, deleted or added, so update the index if the file still exists.
+        acc[path] = current_index[path] if current_index.include?(path)
+        mark_project_as_changed(path)
+      end
+    end
+
+    private
+
+    def shanty_dir
+      File.join(env.root, '.shanty')
+    end
+
+    def index_file
+      File.join(shanty_dir, 'index')
+    end
+
+    def all_index_files
+      Set.new(cached_index.keys + current_index.keys).to_a
+    end
+
+    def cached_index
+      return @cached_index unless @cached_index.nil?
+      return (@cached_index = {}) unless File.exist?(index_file)
+
+      @cached_index = File.open(index_file).each_line.each_with_object({}) do |line, acc|
+        path, *attrs = line.split(UNIT_SEPARATOR)
+        acc[path] = attrs
+      end
+    end
+
+    def cached_index=(new_index)
+      File.open(index_file, 'w+') do |f|
+        new_index.each do |path, attrs|
+          f.puts(attrs.unshift(path).join(UNIT_SEPARATOR))
+        end
+      end
+    end
+
+    def unchanged_in_index?(path)
+      cached = cached_index[path]
+      current = current_index[path]
+      !cached.nil? && !current.nil? && current == cached
+    end
+
+    def current_index
+      @current_index ||= Find.find(env.root).each_with_object({}) do |path, acc|
+        # FIXME: Pass in list of excludes and match as follows:
+        # next Find.prune if path =~ /(build|.git|.gradle)/
+        next unless File.exist?(path)
+        s = File.stat(path)
+        next if s.directory?
+
+        acc[path] = [s.mtime.to_i, s.size]
+      end
+    end
+
+    def mark_project_as_changed(path)
+      project = graph.owner_of_file(File.join(env.root, path))
+      project.changed = true unless project.nil?
+    end
+  end
+end

data/lib/shanty/plugin.rb

@@ -4,23 +4,16 @@ require 'shanty/project_template'
 module Shanty
   # Some basic functionality for every plugin.
   module Plugin
-    def self.extended(mod)
-      mod.module_eval do
-        def self.included(cls)
-          copy_subscribes_to_class(cls)
-        end
-      end
-    end
-
-    def copy_subscribes_to_class(cls)
-      @subscriptions.each do |args|
-        cls.subscribe(*args)
+    def add_to_project(project)
+      project.singleton_class.include(self)
+      @callbacks.each do |callback|
+        project.subscribe(*callback)
       end
     end
 
     def subscribe(*args)
-      @subscriptions ||= []
-      @subscriptions.push(args)
+      @callbacks ||= []
+      @callbacks.push(args)
     end
   end
 end

data/lib/shanty/project.rb

@@ -7,7 +7,7 @@ module Shanty
     include Mixins::ActsAsLinkGraphNode
     include Mixins::Callbacks
 
-    attr_accessor :name, :path, :options, :parents_by_name, :changed
+    attr_accessor :name, :path, :options, :parents_by_path, :changed
     attr_reader :changed
     alias_method :changed?, :changed
 
@@ -19,11 +19,11 @@ module Shanty
       @name = project_template.name
       @path = project_template.path
       @options = project_template.options
-      @parents_by_name = project_template.parents
+      @parents_by_path = project_template.parents
       @changed = false
 
       project_template.plugins.each do |plugin|
-        self.class.include plugin
+        plugin.add_to_project(self)
       end
 
       instance_eval(&project_template.after_create) unless project_template.after_create.nil?
@@ -52,7 +52,7 @@ module Shanty
     #
     # Returns a simple String representation of this instance.
     def to_s
-      "Name: #{name}"
+      "Name: #{name}, Type: #{self.class}"
     end
 
     # Public: Overriden String conversion method to return a more detailed
@@ -67,5 +67,13 @@ module Shanty
         options: options
       }.inspect
     end
+
+    private
+
+    def within_project_dir
+      Dir.chdir(path) do
+        yield
+      end
+    end
   end
 end

data/lib/shanty/project_template.rb

@@ -6,18 +6,21 @@ module Shanty
   class ProjectTemplate
     extend Mixins::AttrCombinedAccessor
 
-    attr_combined_accessor :name, :type, :plugins, :parents, :options
-    attr_reader :path
+    attr_combined_accessor :name, :type, :priority, :plugins, :parents, :options
+    attr_writer :name, :type, :priority, :plugins, :parents, :options
+    attr_reader :root, :path
 
-    def initialize(path, args = {})
+    def initialize(root, path)
       fail 'Path to project must be a directory.' unless File.directory?(path)
 
+      @root = root
       @path = path
       @name = File.basename(path)
-      @type = args[:type] || StaticProject
-      @plugins = args[:plugins] || []
-      @parents = args[:parents] || []
-      @options = args[:options] || {}
+      @type = StaticProject
+      @priority = 0
+      @plugins = []
+      @parents = []
+      @options = []
 
       execute_shantyfile
     end
@@ -27,7 +30,7 @@ module Shanty
 
       return unless File.exist?(shantyfile_path)
 
-      eval(File.read(shantyfile_path))
+      instance_eval(File.read(shantyfile_path), shantyfile_path)
     end
 
     def plugin(plugin)
@@ -35,7 +38,8 @@ module Shanty
     end
 
     def parent(parent)
-      @parents << parent
+      # Will make the parent path relative to the root if (and only if) it is relative.
+      @parents << File.expand_path(parent, @root)
     end
 
     def option(key, value)

data/lib/shanty/projects/{ruby.rb → rubygem.rb}

@@ -2,7 +2,7 @@ require 'shanty/project'
 
 module Shanty
   # Public: Represents a projects created with the Ruby language.
-  class RubyProject < Project
+  class RubygemProject < Project
     subscribe :build, :on_build
 
     def on_build

data/lib/shanty/task_env.rb

@@ -0,0 +1,24 @@
+require 'delegate'
+
+module Shanty
+  #
+  class TaskEnv < SimpleDelegator
+    alias_method :env, :__getobj__
+
+    def graph
+      @graph ||= construct_project_graph
+    end
+
+    private
+
+    def construct_project_graph
+      project_templates = Dir.chdir(root) do
+        Discoverer.new(env).discover_all.sort_by(&:priority).reverse.uniq(&:path)
+      end
+
+      Graph.new(project_templates).tap do |graph|
+        Mutator.new(env, graph).apply_mutations
+      end
+    end
+  end
+end

data/lib/shanty/task_set.rb

@@ -0,0 +1,45 @@
+module Shanty
+  # Public: Discover shanty tasks
+  class TaskSet
+    class << self
+      attr_reader :task_sets, :tasks, :partial_task
+    end
+
+    # This method is auto-triggered by Ruby whenever a class inherits from
+    # Shanty::TaskSet. This means we can build up a list of all the tasks
+    # without requiring them to register with us - neat!
+    def self.inherited(task_set)
+      @task_sets ||= []
+      @task_sets << task_set
+    end
+
+    def self.desc(syntax, desc)
+      partial_task[:syntax] = syntax
+      partial_task[:desc] = desc
+    end
+
+    def self.param(name, options = {})
+      partial_task[:params][name] = options
+    end
+
+    def self.option(name, options = {})
+      partial_task[:options][name] = options
+    end
+
+    def self.method_added(name)
+      @tasks ||= {}
+      @tasks[name] = partial_task.merge(klass: self)
+
+      # Now reset the task definition.
+      @partial_task = {}
+    end
+
+    def self.partial_task
+      @partial_task ||= {}
+      @partial_task[:params] ||= {}
+      @partial_task[:options] ||= {}
+
+      @partial_task
+    end
+  end
+end

data/lib/shanty/{tasks → task_sets}/basic.rb

@@ -1,38 +1,43 @@
 require 'i18n'
-require 'shanty/task'
+require 'shanty/task_set'
 require 'shanty/util'
 
 module Shanty
   # Public: A set of basic tasks that can be applied to all projects and that
   # ship with the core of Shanty.
-  class BasicTasks < Shanty::Task
-    desc 'tasks.projects.desc'
+  class BasicTasks < TaskSet
+    desc 'init', 'tasks.init.desc'
+    def init(_options, _task_env)
+      # FIXME
+    end
+
+    desc 'projects [--changed] [--types TYPE,TYPE,...]', 'tasks.projects.desc'
     option :changed, type: :boolean, desc: 'tasks.common.options.changed'
     option :types, type: :array, desc: 'tasks.common.options.types'
-    def projects(options, graph)
-      graph.projects.each do |project|
+    def projects(options, task_env)
+      task_env.graph.each do |project|
         next if options.changed? && !project.changed?
         puts project
       end
     end
 
-    desc 'tasks.build.desc'
+    desc 'build [--changed] [--watch] [--types TYPE,TYPE,...]', 'tasks.build.desc'
     option :changed, type: :boolean, desc: 'tasks.common.options.changed'
     option :watch, type: :boolean, desc: 'tasks.common.options.watch'
     option :types, type: :array, desc: 'tasks.common.options.types'
-    def build(options, graph)
-      graph.projects.each do |project|
+    def build(options, task_env)
+      task_env.graph.each do |project|
         next if options.changed? && !project.changed?
         fail I18n.t('tasks.build.failed', project: project) unless project.publish(:build)
       end
     end
 
-    desc 'tasks.test.desc'
+    desc 'test [--changed] [--watch] [--types TYPE,TYPE,...]', 'tasks.test.desc'
     option :changed, type: :boolean, desc: 'tasks.common.options.changed'
     option :watch, type: :boolean, desc: 'tasks.common.options.watch'
     option :types, type: :array, desc: 'tasks.common.options.types'
-    def test(options, graph)
-      graph.projects.each do |project|
+    def test(options, task_env)
+      task_env.graph.each do |project|
         next if options.changed? && !project.changed?
         fail I18n.t('tasks.test.failed', project: project) unless project.publish(:test)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shanty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Jansen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algorithms
@@ -18,9 +18,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -38,9 +32,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,9 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -58,9 +46,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,169 +53,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: graph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: hooks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.11
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.11
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -238,9 +144,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -248,12 +151,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-description: Pluggable, destributed continous delivery framework. Works with your
-  existing build, test, CI, deployment, or indeed any tools to provide a cohesive
-  way to do continuous delivery.
+description: See https://github.com/shantytown/shanty for more information!
 email:
 - nathan@nathankleyn.com
 executables:
@@ -266,28 +164,28 @@ files:
 - lib/shanty.rb
 - lib/shanty/cli.rb
 - lib/shanty/discoverer.rb
-- lib/shanty/discoverers/gradle.rb
+- lib/shanty/discoverers/rubygem.rb
 - lib/shanty/discoverers/shantyfile.rb
-- lib/shanty/global.rb
+- lib/shanty/env.rb
 - lib/shanty/graph.rb
 - lib/shanty/mixins/acts_as_link_graph_node.rb
 - lib/shanty/mixins/attr_combined_accessor.rb
 - lib/shanty/mixins/callbacks.rb
 - lib/shanty/mutator.rb
-- lib/shanty/mutators/git.rb
+- lib/shanty/mutators/bundler.rb
+- lib/shanty/mutators/changed.rb
 - lib/shanty/plugin.rb
 - lib/shanty/plugins/bundler.rb
 - lib/shanty/plugins/rspec.rb
 - lib/shanty/plugins/rubocop.rb
 - lib/shanty/project.rb
 - lib/shanty/project_template.rb
-- lib/shanty/projects/ruby.rb
+- lib/shanty/projects/rubygem.rb
 - lib/shanty/projects/static.rb
-- lib/shanty/task.rb
-- lib/shanty/tasks/basic.rb
+- lib/shanty/task_env.rb
+- lib/shanty/task_set.rb
+- lib/shanty/task_sets/basic.rb
 - lib/shanty/util.rb
-- lib/shanty/vcs_range.rb
-- lib/shanty/vcs_ranges/local_git.rb
 homepage: https://github.com/shantytown/shanty
 licenses:
 - MIT
@@ -308,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Pluggable, destributed continous delivery framework.