european-carry-all 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2FkMzNmODZlM2E0ZGMyODE0NGJjYWRiYmVjYjRmNjVmM2E1YTY4ZA==
+    MjM0MzAyMTNlMGJjMTZiZjIzNjQ3YmVjMzViMjJmYTU5ZjU2MGU1Mw==
   data.tar.gz: !binary |-
-    ZGVkY2VlOWQ1NGQ2ZWU2NjRjYTM4ZGQxZTgzNjc3N2Q3MzZjZDJkNA==
+    NzNiNDEyYjdmYTA3ODA5ZDM4N2Y0MmJlMjdlYmMwY2FjZTgyYzBmYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmY2ZGIyOGE5YjYwOTM5Yzc1ODI0ZWJmYjU5OWY5ZjdlODc1YmUzMzZjMWNh
-    ZmY4MGVmODNiZWVhODlkOGZhMGRlMzU0ZjlkMTliZjFkZjUzMDY3MGNiZjM4
-    YzY3N2RiNGQ0NDI2NzQyZGJmM2EyMzA5ZmFkMmI3ZThjYTFiMmE=
+    M2UwYzQ1YzljZTgyOGUwZjFkYzQzNjk2NDdiN2E3NmY4YjgzZTRjNjE1ODI3
+    YmE3NzM1ZWRjOWI5ZjBiNWU0NDU2MGVmNjU3ZmViMTFkNDczNDlkMDBmMWIw
+    MGZkYjFkNjYzY2Y3ZTE3Yjg5NzM5YzRhZDYwNjcyN2YzMDQ3NDc=
   data.tar.gz: !binary |-
-    YTgzNDI4YWUwNmI2YzE1ZWQ4NDc3MjUyYTUyMTM1NjUxMjU2MTdjOGM3YmJi
-    YTcxYWZiYTY2NzhmMDNmMmQ3NWQ3MTU0ZWY3Y2JjYzFjZmMxZjhjYWY3NThl
-    ZjQ2YTE5NWFlZWM5MTkyYjYwMjFjMWJjZjdlODVkOTJlNzUzNzE=
+    MzUzYWJjY2MwMzNkNjdmMzY5M2ExNzQ5NzE3ZDg1YWYwYzEwMjk5MDYwNzc0
+    MDI5MWM2NWVmNGVhM2IxZDgzMDllNTgxZDc2MmQ4NGY1NGIwMTZkN2ZlYmUw
+    Yjk1MjJiYzNiOGE1Y2NlNzdlNzM3OGI5NGZlYzMwODM1Y2RhMGM=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    european-carry-all (0.0.2)
+    european-carry-all (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/european-carry-all.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ['northridge@gmail.com']
   s.homepage    = 'https://github.com/jedcn/european-carry-all'
   s.summary     = %q{A lightweight DSL for describing a project portfolio}
-  s.description = %q{A scheme for describing project portfolios. It's not a purse, and I'm not a cat lady!}
+  s.description = %q{A scheme for describing project portfolios.}
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'guard-rspec'

data/lib/{european.rb → european-carry-all.rb}

@@ -1,6 +1,8 @@
+require_relative 'european/name_interpreter'
 require_relative 'european/named_carry_all_item'
 require_relative 'european/build'
 require_relative 'european/source_system'
 require_relative 'european/build_system'
+require_relative 'european/deploy_system'
 require_relative 'european/project'
 require_relative 'european/carry_all'

data/lib/european/build.rb

@@ -5,7 +5,7 @@ module European
 
     def initialize(args)
       @build_system = args[:build_system] || raise(':build_system is required')
-      @project = args[:project] || raise(':project is required')
+      @project = args[:project]
       @name = args[:name] || raise(':name is required')
       @url = args[:url] || raise(':url is required')
     end

data/lib/european/build_system.rb

@@ -2,8 +2,6 @@ module European
 
   class BuildSystem < NamedCarryAllItem
 
-    attr_reader :projects, :builds
-
     attr_reader :url, :project_path
 
     def initialize(args)
@@ -12,10 +10,6 @@ module European
       @builds = {}
     end
 
-    def to_s
-      "BuildSystem '#{name}'"
-    end
-
     #
     # Methods invoked by CarryAll
     def url_for_project_named(name)
@@ -23,11 +17,29 @@ module European
     end
 
     def add_project(project)
-      projects[project.name] = project
+      @projects[project.name] = project
     end
 
     def add_build(build)
-      builds[build.name] = build
+      @builds[build.name] = build
+    end
+
+    def projects()
+      @projects.values
+    end
+
+    def project(args)
+      named = args[:named] || raise('named is required')
+      @projects[named]
+    end
+
+    def builds
+      @builds.values
+    end
+
+    def build(args)
+      named = args[:named] || raise('named is required')
+      @builds[named]
     end
 
     #

data/lib/european/carry_all.rb

@@ -2,48 +2,106 @@ module European
 
   class CarryAll
 
-    attr_reader :projects, :build_systems, :source_systems
-
     def initialize
       @projects = {}
       @build_systems = {}
+      @deploy_systems = {}
       @source_systems = {}
+      @post_setup_procs = []
     end
 
     def setup
-      source_systems.values.each { |system| system.setup }
-      build_systems.values.each { |system| system.setup }
-      projects.values.each { |project| project.setup }
+      @source_systems.values.each { |system| system.setup }
+      @build_systems.values.each { |system| system.setup }
+      @deploy_systems.values.each { |system| system.setup }
+      default_project = @projects['defaults']
+      default_project.setup if default_project
+      @projects.delete 'defaults'
+      @projects.values.each do |project|
+        next if project == default_project
+        project.exec default_project.proc if default_project
+        project.setup
+      end
+      @post_setup_procs.each do |proc|
+        instance_eval &proc
+      end
     end
 
     def add_project(project)
-      projects[project.name] = project
+      @projects[project.name] = project
     end
 
     def add_build_system(build_system)
-      build_systems[build_system.name] = build_system
+      @build_systems[build_system.name] = build_system
+    end
+
+    def add_deploy_system(deploy_system)
+      @deploy_systems[deploy_system.name] = deploy_system
     end
 
     def add_source_system(source_system)
-      source_systems[source_system.name] = source_system
+      @source_systems[source_system.name] = source_system
+    end
+
+    def after_setup(&block)
+      @post_setup_procs << block
+    end
+
+    # TODO: Ack! This is shadowing the kernel defined 'project' from
+    # the DSL portion in load_file. Is there anyway to avoid globally
+    # defining 'project'?
+    def project(args)
+      named = args[:named] || raise(':named is required')
+      @projects[named]
+    end
+
+    def projects
+      @projects.values
+    end
+
+    def build_system(args)
+      named = args[:named] || raise(':named is required')
+      @build_systems[named]
+    end
+
+    def build_systems
+      @build_systems.values
+    end
+
+    def deploy_system(args)
+      named = args[:named] || raise(':named is required')
+      @deploy_systems[named]
+    end
+
+    def deploy_systems
+      @deploy_systems.values
+    end
+
+    def source_system(args)
+      named = args[:named] || raise(':named is required')
+      @source_systems[named]
+    end
+
+    def source_systems
+      @source_systems.values
     end
 
     def register(item, action, name)
       if item.class == Project
         project = item
-        if action == :builds_in
-          build_system = @build_systems[name]
-          raise "Unknown BuildSystem '#{name}'" unless build_system
-          project.build_system = build_system
-          build_system.add_project project
-        elsif action == :has_build
-          build_system = project.build_system
-          if build_system.builds[name]
-            raise "#{build_system} already has a build named #{name}'"
+        if action == :has_build
+          ni = NameInterpreter.new name
+          build_system_name = ni.prefix
+          build_name = ni.name
+          build_system = build_systems.find { |bs| bs.name == build_system_name }
+          if build_system.build named: build_name
+            raise "#{build_system} already has a build named #{build_name}'"
           end
-          url = build_system.url_for_project_named name
-          build = Build.new build_system: build_system, project: project, name: name, url: url
+          url = build_system.url_for_project_named build_name
+          build = Build.new build_system: build_system, project: project, name: build_name, url: url
           build_system.add_build build
+          build_system.add_project project
+          project.add_build_system build_system
           project.add_build build
         elsif action == :is_hosted_on
           source_system = @source_systems[name]
@@ -52,6 +110,23 @@ module European
           source_system.add_project project
           url = source_system.src_url_for_project_named project.name
           project.src_url = url
+        elsif action == :deploys_from
+          deploy_system = @deploy_systems[name]
+          raise "Unknown DeploySystem '#{name}'" unless deploy_system
+          project.deploy_systems << deploy_system
+          deploy_system.add_project project
+        elsif action == :has_deploy
+          ni = NameInterpreter.new name
+          deploy_system_name = ni.prefix
+          build_name = ni.name
+          deploy_system = deploy_systems.find { |ds| ds.name == deploy_system_name }
+          if deploy_system.build named: build_name
+            raise "#{deploy_system} already has a deploy named '#{build_name}'"
+          end
+          url = deploy_system.url_for_project_named build_name
+          deploy = Build.new build_system: deploy_system, project: project, name: build_name, url: url
+          deploy_system.add_build deploy
+          project.add_deploy deploy
         end
       end
     end
@@ -64,17 +139,49 @@ module European
 
   class CarryAll
 
+    require 'tempfile'
+    require 'open-uri'
+
+    def self.load_url(url)
+      file = Tempfile.new 'carry_all'
+      url_content = open(url, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read
+      file.write url_content
+      file.close
+      load_file file.path
+    end
+
     def self.load_file(file)
       carry_all = CarryAll.new
       lambda {
+        # TODO: Is there any way to define this.. just on an object..
+        # and have that DSL file be loaded in the context of that object?
         Kernel.send :define_method, :project do |name, &block|
           carry_all.add_project(European::Project.new({name: name, proc: block, carry_all: carry_all}))
         end
 
+        Kernel.send :define_method, :build do |name|
+          carry_all.after_setup do
+            ni = NameInterpreter.new name
+            build_system_name = ni.prefix
+            build_name = ni.name
+            build_system = @build_systems[build_system_name]
+            if build_system.build named: name
+              raise "#{build_system} already has a build named #{name}'"
+            end
+            url = build_system.url_for_project_named build_name
+            build = Build.new build_system: build_system, project: nil, name: build_name, url: url
+            build_system.add_build build
+          end
+        end
+
         Kernel.send :define_method, :build_system do |name, &block|
           carry_all.add_build_system(European::BuildSystem.new({name: name, proc: block, carry_all: carry_all}))
         end
 
+        Kernel.send :define_method, :deploy_system do |name, &block|
+          carry_all.add_deploy_system(European::DeploySystem.new({name: name, proc: block, carry_all: carry_all}))
+        end
+
         Kernel.send :define_method, :source_system do |name, &block|
           carry_all.add_source_system(European::SourceSystem.new({name: name, proc: block, carry_all: carry_all}))
         end

data/lib/european/deploy_system.rb

@@ -0,0 +1,57 @@
+module European
+
+  class DeploySystem < NamedCarryAllItem
+
+    attr_reader :url, :project_path
+
+    def initialize(args)
+      super args
+      @projects = {}
+      @builds = {}
+    end
+
+    #
+    # Methods invoked by CarryAll
+    def url_for_project_named(name)
+      eval project_path
+    end
+
+    def add_project(project)
+      @projects[project.name] = project
+    end
+
+    def add_build(build)
+      @builds[build.name] = build
+    end
+
+    def projects()
+      @projects.values
+    end
+
+    def project(args)
+      named = args[:named] || raise('named is required')
+      @projects[named]
+    end
+
+    def builds
+      @builds.values
+    end
+
+    def build(args)
+      named = args[:named] || raise('named is required')
+      @builds[named]
+    end
+
+    #
+    # DSL
+    def url_is(url)
+      @url = url
+    end
+
+    def hosts_projects_at(project_path)
+      @project_path = project_path
+    end
+
+  end
+
+end

data/lib/european/name_interpreter.rb

@@ -0,0 +1,17 @@
+module European
+  class NameInterpreter
+
+    def initialize(name)
+      @name = name
+    end
+
+    def prefix
+      @name[0..@name.index('/')-1]
+    end
+
+    def name
+      @name[@name.index('/')+1..-1]
+    end
+
+  end
+end

data/lib/european/named_carry_all_item.rb

@@ -2,7 +2,7 @@ module European
 
   class NamedCarryAllItem
 
-    attr_reader :name
+    attr_reader :name, :proc
 
     def initialize(args)
       @name = args[:name] || raise(':name is required')
@@ -13,5 +13,13 @@ module European
       instance_eval &@proc if @proc
     end
 
+    def exec(proc)
+      instance_eval &proc
+    end
+
+    def to_s
+      "#{self.class} '#{name}'"
+    end
+
   end
 end

data/lib/european/project.rb

@@ -3,13 +3,16 @@ module European
 
     attr_reader :carry_all
 
-    attr_accessor :build_system, :source_system
+    attr_accessor :build_systems, :source_system, :deploy_systems
 
-    attr_accessor :builds, :src_url
+    attr_accessor :builds, :deploys, :src_url
 
     def initialize(args)
       @carry_all = args[:carry_all] || raise(':carry_all is required')
       @builds = {}
+      @deploys = {}
+      @deploy_systems = []
+      @build_systems = []
       super args
     end
 
@@ -23,15 +26,27 @@ module European
       builds[build.name] = build
     end
 
-    #
-    # DSL
-    def builds_in(name)
-      carry_all.register self, :builds_in, name
+    def add_build_system(build_system)
+      build_systems << build_system
+    end
+
+    def has_deploy(name)
+      carry_all.register self, :has_deploy, name
+    end
+
+    def add_deploy(deploy)
+      deploys[deploy.name] = deploy
     end
 
+    #
+    # DSL
     def is_hosted_on(name)
       carry_all.register self, :is_hosted_on, name
     end
 
+    def deploys_from(name)
+      carry_all.register self, :deploys_from, name
+    end
+
   end
 end