dply 0.2.19 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf43174e5252c0faeb8aef5c900dc0cf0c988fc1
-  data.tar.gz: 4dae0c3e99804ae6d9feab5a8d8ae875681122e0
+SHA256:
+  metadata.gz: ffaa634a168cfe8ccaab138bff92455a00ea17fab5ed722046add3e4ad9107f1
+  data.tar.gz: 9890f68e334f77d50bcef82fb1b508c137c52f26b5a39b4ff872cd4180f2e6ce
 SHA512:
-  metadata.gz: c43c24b1062726c5372ad4a350e54abde63557ea97722f2b6902e7be6cb3389f68c301d3eef900aa0c783fdbf206a0616070b825bec49e6dacc727840d6b2506
-  data.tar.gz: d892b00aa2efadefbb6b024a47fad9623aff43d680085ae61613d51da2e32775d7f0e2c8d1038b22490d4387d9a0004d17a1987f27968f1baa74ee5a2dc13873
+  metadata.gz: 3a2991743833049bb2ec714dbc3da301affae32812e0f8f806a9a96104b920291df9a1ee8563b2e71e304df89d5e1e8b68b426ec2a79e3033e315d46c9b2e7be
+  data.tar.gz: 2c99051eec06e0dbb9e25cd1c9d0ea804073db65f0355bf1931b13a8749911e51080e49008564b905202944b0e232afd3bbdade973ab80da3d413a782df3ed8f

data/.rspec

@@ -0,0 +1,4 @@
+--format documentation
+--color
+--require spec_helper
+--warnings

data/Rakefile

@@ -7,17 +7,3 @@ Rake::TestTask.new do |t|
   t.pattern = "test/unit/*_test.rb"
 end
 
-task :dev_install do
-  load './lib/dply/version.rb'
-  version = Dply::VERSION
-  sh "gem build dply.gemspec"
-  sh "gem install dply-#{version}.gem"
-end
-
-
-file "wtf" do |t|
-  cp "dply.gemspec", t.name
-end
-
-task :lol => :wtf
-

data/TODO

@@ -1,4 +1,3 @@
 - packages.yml
 - rpm -V --nofiles --nodeps --noscripts rbgem-bundler rbgem-unicorn ImageMagick-devel ImageMagick readline-devel zlib-devel nodejs geos1-devel
 - sudo yum install
-- shell escape everywhere wherever backticks used (curl)

data/code_dump/old_remote_task.rb

@@ -78,6 +78,8 @@ module Dply
 
     def handle_ready_stream(stream)
       host_string = "#{@io_names[stream]}"
+      #readline is bad here...will block
+      #should use read_nonblock to read full lines and keep partial lines in fd specific old buffer...then concatenate old_buffer and new lines
       printf @job_output_template, host_string, stream.readline
       return false
     rescue EOFError,Errno::ECONNRESET, Errno::EPIPE, Errno::EIO => e

data/{dev_bin → dev_exe}/drake

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-load __dir__ + '/../bin/drake'
+load __dir__ + '/../exe/drake'

data/dply.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.add_dependency "ruby-elf", "~> 1.0"
-  spec.add_dependency "ruby-filemagic", "~> 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/{bin → exe}/drake

@@ -5,9 +5,7 @@ $stdout.sync = true
 
 require 'optparse'
 require 'dply/error'
-require 'dply/version'
 require 'dply/logger'
-require 'dply/config'
 require 'pathname'
 
 File.umask 0022
@@ -15,16 +13,16 @@ File.umask 0022
 logger = ::Dply::Logger.logger
 
 options = {}
-opts_parser = OptionParser.new do |opts| 
-    
-    banner = [] 
+opts_parser = OptionParser.new do |opts|
+
+    banner = []
     banner << "Usage: drake [global options] command [options] args"
     banner << "Commands: deploy reload task"
-    
+
     banner << "Options: "
     opts.banner = banner.join("\n")
 
-    opts.on("-d", "--dir [DEPLOY DIR]" , "Set dir") do |d| 
+    opts.on("-d", "--dir [DEPLOY DIR]" , "Set dir") do |d|
       path = Pathname.new(d)
       raise ::Dply::Error, "dir path must be absolute" if path.relative?
       options[:dir] = path
@@ -35,6 +33,7 @@ opts_parser = OptionParser.new do |opts|
     end
 
     opts.on("-v", "--version", "Show version") do |v|
+      require 'dply/version'
       puts ::Dply::VERSION
       exit
     end
@@ -51,10 +50,10 @@ opts_parser = OptionParser.new do |opts|
       logger.trace_mode = true
     end
 
-    opts.on_tail("-h", "--help", "Show this message") do 
+    opts.on_tail("-h", "--help", "Show this message") do
       puts opts
       exit
-    end 
+    end
 end
 
 def run_cli(command, argv)
@@ -75,15 +74,15 @@ begin
   case command
   when :deploy, :task, :app_task,
        :build, :depcheck, :"install-pkgs",
-       :status, :devbuild, :setup
+       :status, :devbuild, :setup, :run
     run_cli command, ARGV
   when :reload, :stop, :start, :reopen_logs
     require 'dply/cli/ctl'
     ctl = Dply::Cli::Ctl.new
     ctl.run command
-  when /\A[a-zA-Z_\-0-9]+[:][a-zA-Z_\-0-9]+\z/
-    require 'dply/tasks'
-    ::Dply::Tasks.new.rake command.to_s
+  when :console
+    require 'pry'
+    binding.pry
   when :''
     puts opts_parser
   else
@@ -101,4 +100,3 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument, ::Dply::Error
     abort
   end
 end
-

data/lib/dply/TEST_TODO

@@ -0,0 +1,50 @@
+NN: version.rb
+NN: error.rb
+NN: custom_logger.rb
+NN: logger.rb
+
+D: bundle.rb
+D: command.rb
+D: elf.rb
+D: env.rb
+D: linker.rb
+D: rpm.rb
+D: yum.rb
+D: pkgs.rb
+D: curl.rb
+
+E: repo.rb
+E: git.rb
+E: deplist.rb
+E: helper.rb
+E: config_downloader.rb
+E: remote_archive.rb
+
+
+
+?: code_archive.rb
+?: config.rb
+?: release.rb
+?: task_dsl.rb
+?: tasklib.rb
+?: tasks_config.rb
+DSL: build.rb
+E: config_struct.rb
+E: jenkins.rb
+E: lock.rb
+E: release_helper.rb
+E: setup.rb
+E: tasks.rb
+H: build_config.rb
+TEST_TODO
+WTF: shared_dirs.rb
+strategy
+strategy.rb
+templates
+todo
+
+write integration tests first
+
+tasks: refactor....remove sudo/useless functions
+config_downloader : remove skip download
+git: issue with checkout....currently no way to distinguish if a branch is being checked out or a file; pull maybe wrongly worded

data/lib/dply/app_config.rb

@@ -0,0 +1,108 @@
+require_relative 'task_dsl'
+require_relative 'error'
+require_relative 'logger'
+
+module Dply
+  class AppConfig
+
+    include Logger
+
+    def initialize
+      @tasks = {}
+      @namespace = nil
+      @inside_namespace = false
+      @config_read = false
+    end
+
+    def run_task(name, optional: false)
+      load_config
+      name = name.to_s
+      task_proc = @tasks[name]
+      if task_proc
+        task_dsl = TaskDsl.new(self)
+        task_dsl.instance_eval &task_proc
+      elsif optional
+        logger.warn "task #{name} not found: skipping"
+      else
+        raise Error, "task '#{name}' not defined"
+      end
+    end
+
+    def load_config
+      return if @config_read
+      bundler_setup
+      check_config_exists
+      read_config "drakefile.rb", optional: true
+      Dir["dply/*.rb"].each do |i|
+        read_config i
+      end
+      @config_read = true
+    end
+
+    private
+
+    [:build, :test, :reload, :stop, :reopen_logs].each do |i|
+      define_method i do |&block|
+        task i, &block
+      end
+    end
+
+    def deploy(kind, &block)
+      name = "deploy:#{kind}"
+      task name, &block
+    end
+
+    def task(name, &block)
+      task_name = @namespace ? "#{@namespace}:#{name}" : name
+      @tasks[task_name.to_s] = block
+    end
+
+    def namespace(name, &block)
+      raise "nested namespaces not allowed" if @inside_namespace
+      @namespace = name
+      @inside_namespace = true
+      instance_eval &block
+      @namespace = nil
+      @inside_namespace = false
+    end
+
+    def read_config(file, optional: false)
+      if not File.readable? file
+        raise Error, "#{file} not found" if not optional
+        return
+      end
+      instance_eval(File.read(file), file)
+    rescue NoMethodError => e
+      raise Error, "invalid option used in config: #{e.name}"
+    end
+
+    def bundler_setup
+      return if not File.exist? "Gemfile"
+      require 'bundler'
+      deactivate_gem 'ruby-elf' # in case gemfile contains another version of ruby-elf
+      Bundler.setup
+      reactivate_gem 'dply'
+      logger.debug { "LOAD_PATH: #{$LOAD_PATH.inspect}" }
+    end
+
+    def reactivate_gem(name)
+      spec = Gem.loaded_specs[name]
+      return if not spec
+      lib = "#{spec.gem_dir}/lib"
+      $LOAD_PATH.unshift lib if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+    end
+
+    def deactivate_gem(name)
+      spec = Gem.loaded_specs[name]
+      return if not spec
+      $LOAD_PATH.delete "#{spec.gem_dir}/lib"
+      Gem.loaded_specs.delete name
+    end
+
+    def check_config_exists
+      exists = File.exist?("drakefile.rb") || File.directory?("dply")
+      raise Error, "drakefile.rb or dply/ dir not present" if not exists
+    end
+
+  end
+end

data/lib/dply/base_config.rb

@@ -0,0 +1,110 @@
+require 'dply/error'
+module Dply
+  class BaseConfig
+
+    def self.define_opts(&block)
+      opts = {}
+      define_opt(opts)
+      opts.instance_eval(&block)
+      @struct_klass = new_struct_klass(opts)
+      opts.each do |opt, _|
+        define_opt_setter(opt)
+      end
+    end
+
+    def self.define_opt(opts)
+      opts.define_singleton_method(:opt) do |name, type: Object|
+        self[name] = type
+      end
+    end
+
+    def self.new_struct_klass(opts)
+      Class.new do
+
+        def initialize
+          @proc_map = {}
+        end
+
+        def set_proc(opt, pr)
+          @proc_map[opt] = pr
+          ivar = "@#{opt}"
+          remove_instance_variable(ivar) if instance_variable_defined?(ivar)
+        end
+
+        opts.each do |opt, type|
+
+          define_method "#{opt}=" do |value|
+            assert_type(opt, value, type)
+            instance_variable_set("@#{opt}", value)
+          end
+
+          define_method opt do
+            if instance_variable_defined?("@#{opt}")
+              instance_variable_get("@#{opt}")
+            elsif @proc_map.key?(opt)
+              value = instance_eval(&@proc_map.fetch(opt))
+              public_send("#{opt}=", value)
+            else
+              instance_variable_set("@#{opt}", nil)
+            end
+          end
+        end
+
+        opts = nil
+
+        private def assert_type(opt, value, type)
+          if not value.is_a?(type)
+            raise Error, "opt(#{opt}) has value '#{value}' of type '#{value.class}' (Expected: '#{type}')"
+          end
+        end
+      end
+    end
+
+    def self.define_opt_setter(opt)
+      define_method(opt) do |value = nil, &block|
+        set opt, value, &block
+      end
+    end
+
+    def self.struct_klass
+      @struct_klass
+    end
+
+    def self.build(path = nil, &block)
+      i = new
+      i.read(path) if path
+      i.instance_eval(&block) if block_given?
+      i.opts_struct
+    end
+
+    private_class_method :new
+
+    attr_reader :opts_struct
+
+    def initialize
+      @opts_struct = self.class.struct_klass.new
+      default_config
+    end
+
+    def default_config
+    end
+
+    def set(opt, value, &block)
+      if block
+        @opts_struct.set_proc(opt, block)
+      else
+        @opts_struct.public_send("#{opt}=", value)
+      end
+    end
+
+    def read(path, optional: false)
+      if not File.readable?(path)
+        return if optional
+        raise Error, "config #{path} not readable"
+      end
+      instance_eval(File.read(path), path)
+    rescue NoMethodError => e
+      raise Error, "invalid option used in config: #{e.name}"
+    end
+  end
+end

data/lib/dply/build.rb

@@ -2,7 +2,7 @@ require 'dply/helper'
 require 'dply/setup'
 require 'dply/config_downloader'
 require 'dply/yum'
-require 'dply/tasks'
+require 'dply/util'
 require 'forwardable'
 require 'digest'
 
@@ -31,12 +31,14 @@ module Dply
         install_pkgs
         clean_build_dir
         link_build_dir
-        tasks.build config.task
+        bundle.install
+        bundle.clean
+        util.run config.task
         generate_checksum
       end
     end
 
-    private 
+    private
 
     def setup
       setup = Setup.new(@config)
@@ -46,10 +48,10 @@ module Dply
     def download_configs
       files = config_map.values.uniq
       downloader = ConfigDownloader.new(files, config_download_url)
-      downloader.skip_download = config_skip_download 
+      downloader.skip_download = config_skip_download
       downloader.download_all
     end
-  
+
     def git_step
       return unless config.git
       if config.no_pull
@@ -60,12 +62,12 @@ module Dply
     end
 
     def link_all
-      tasks.link "#{config.dir}/shared", dir_map
-      tasks.link "#{config.dir}/config", config_map
+      util.link "#{config.dir}/shared", dir_map
+      util.link "#{config.dir}/config", config_map
     end
 
     def install_pkgs
-      tasks.install_pkgs(build_mode: true, use_yum: config.use_yum)
+      util.install_pkgs(build_mode: true)
     end
 
     def clean_build_dir
@@ -79,7 +81,7 @@ module Dply
       FileUtils.rm_rf build_artifacts if File.exists? build_artifacts
       symlink build_dir, build_artifacts
     end
-    
+
     def repo_dir
       @repo_dir ||= "#{config.dir}/repo"
     end
@@ -96,8 +98,12 @@ module Dply
       end
     end
 
-    def tasks
-      @tasks ||= Tasks.new
+    def util
+      @util ||= Util.new
+    end
+
+    def bundle
+      @bundle ||= Bundle.new
     end
 
   end