dply 0.2.19 → 0.3.0

data/spec/repo.rb

@@ -0,0 +1,27 @@
+module RepoHelper
+  def self.system!(command)
+    status = system command
+    raise "error in '#{command}'" if not status
+  end
+
+  def self.setup_source_repo(repo_dir)
+    FileUtils.rm_rf repo_dir
+    FileUtils.cp_r "spec/test_data/sample_repo", repo_dir
+    Dir.chdir repo_dir do
+      script = <<~SCRIPT
+        git init
+        touch testfile
+        git add .
+        git commit -m 'initial commit'
+        git checkout -b some_branch
+        touch some_file
+        git add some_file
+        git commit -m "add some_file"
+        git checkout master
+      SCRIPT
+      script.each_line { |l| system! "#{l.chomp} > /dev/null 2>&1" }
+    end
+  end
+end
+
+RepoHelper.setup_source_repo "tmp/repo.git"

data/spec/spec_helper.rb

@@ -0,0 +1,44 @@
+if ENV["ALL_TESTS"]
+  require 'simplecov'
+  SimpleCov.start do
+    track_files "lib/dply/**/*.rb"
+  end
+end
+
+RSpec.configure do |config|
+  config.exclude_pattern = "**/integration/*_spec.rb" if not ENV["ALL_TESTS"]
+end
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+def silence_warnings(&block)
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  yield
+ensure
+  $VERBOSE = warn_level
+end
+
+def suppress_output(&block)
+  orig_stdout = $stdout.clone
+  orig_stderr = $stderr.clone
+  $stdout.reopen("/dev/null", "a+")
+  $stderr.reopen("/dev/null", "a+")
+  yield
+ensure
+  $stdout.reopen orig_stdout
+  $stderr.reopen orig_stderr
+end
+
+def system!(command, quiet: true)
+  if quiet
+    retval = system command, [:out, :err] => "/dev/null"
+  else
+    retval = system command
+  end
+  raise "error in #{command}" if not retval
+end
+
+silence_warnings do
+  require_relative 'webserver'
+end

data/spec/test_data/build.tar.gz.md5

@@ -0,0 +1 @@
+642071a065e730cdb86fa3b6892ff619

data/spec/test_data/bundle/gems_installed/Gemfile

@@ -0,0 +1 @@
+source "https://rubygems.org"

data/spec/test_data/bundle/gems_not_installed/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "rake"

data/spec/test_data/command/test.rb

@@ -0,0 +1,7 @@
+pid = ARGV.shift.to_i
+shell = Process.ppid != pid
+IO.write "env", Marshal.dump(ENV.to_h)
+IO.write "shell", shell
+IO.write "extra_args", Marshal.dump(ARGV)
+STDOUT.print "out"
+STDERR.print "out"

data/spec/test_data/elf/not_elf

@@ -0,0 +1 @@
+text file

data/spec/test_data/sample_repo/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "rake"

data/spec/test_data/sample_repo/Rakefile

@@ -0,0 +1,3 @@
+task :a do
+  puts "rake task"
+end

data/spec/test_data/sample_repo/app.rb

@@ -0,0 +1 @@
+puts "app"

data/spec/test_data/sample_repo/dply/app.rb

@@ -0,0 +1,33 @@
+test do
+
+end
+
+build do
+  rake :a
+  sh "ls"
+  FileUtils.mkdir_p "vendor"
+  FileUtils.cp "lib/libacl.so.1", "vendor/"
+  archive "test" do
+    add_bundle
+    add "vendor"
+  end
+end
+
+deploy :git do
+  set_env "MIX_ENV", "prod"
+  sh "ls"
+  puts "  git deployed"
+end
+
+deploy :archive do
+  rake :a
+  puts "  archive deployed"
+end
+
+reload do
+  puts "reloaded"
+end
+
+stop do
+  puts "stopped"
+end

data/spec/test_data/sample_repo/pkgs.yml

@@ -0,0 +1,2 @@
+pkgs:
+  - libattr

data/spec/webserver.rb

@@ -0,0 +1,21 @@
+require 'webrick'
+class ::WEBrick::BasicLog
+  def log(level, data)
+  end
+end
+port = 8000
+webserver = Thread.new do
+  server = WEBrick::HTTPServer.new(
+    :Port => port,
+    :DocumentRoot => "#{Dir.pwd}/test/sample_data",
+    Logger: WEBrick::Log.new("/dev/null"),
+    AccessLog: []
+  )
+  server.mount "/tmp/", WEBrick::HTTPServlet::FileHandler, "#{Dir.pwd}/tmp/"
+  server.start
+end
+puts "staring webserver on port #{port}"
+webserver.run
+#webserver.join
+
+at_exit { Thread.kill webserver }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.3.0
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-filemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,42 +61,48 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - TODO
-- bin/dplyr
-- bin/drake
 - code_dump/alt_remote_task.rb
 - code_dump/old_remote_task.rb
-- dev_bin/dplyr
-- dev_bin/drake
+- dev_exe/dplyr
+- dev_exe/drake
 - docs/README
 - docs/dply.rb
 - docs/stages.rb
 - dply.gemspec
+- exe/dplyr
+- exe/drake
 - lib/dply.rb
-- lib/dply/archive.rb
+- lib/dply/TEST_TODO
+- lib/dply/app_config.rb
+- lib/dply/base_config.rb
 - lib/dply/build.rb
 - lib/dply/build_config.rb
 - lib/dply/bundle.rb
-- lib/dply/cli/app_task.rb
 - lib/dply/cli/build.rb
 - lib/dply/cli/ctl.rb
 - lib/dply/cli/depcheck.rb
 - lib/dply/cli/deploy.rb
 - lib/dply/cli/devbuild.rb
 - lib/dply/cli/install_pkgs.rb
+- lib/dply/cli/run.rb
 - lib/dply/cli/setup.rb
 - lib/dply/cli/status.rb
 - lib/dply/cli/task.rb
-- lib/dply/config.rb
+- lib/dply/code_archive.rb
+- lib/dply/command.rb
 - lib/dply/config_downloader.rb
-- lib/dply/config_struct.rb
 - lib/dply/curl.rb
 - lib/dply/custom_logger.rb
 - lib/dply/deplist.rb
+- lib/dply/deploy_config.rb
+- lib/dply/elf.rb
+- lib/dply/env.rb
 - lib/dply/error.rb
 - lib/dply/ext/string.rb
 - lib/dply/git.rb
@@ -120,21 +112,25 @@ files:
 - lib/dply/lock.rb
 - lib/dply/logger.rb
 - lib/dply/pkgs.rb
-- lib/dply/rakelib/drake.rake
 - lib/dply/release.rb
 - lib/dply/release_helper.rb
+- lib/dply/remote_archive.rb
 - lib/dply/repo.rb
 - lib/dply/rpm.rb
+- lib/dply/scripts/depcheck.rb
 - lib/dply/setup.rb
 - lib/dply/shared_dirs.rb
 - lib/dply/strategy.rb
 - lib/dply/strategy/archive.rb
+- lib/dply/strategy/base.rb
 - lib/dply/strategy/git.rb
-- lib/dply/tasks.rb
+- lib/dply/task_dsl.rb
 - lib/dply/templates/build.erb
 - lib/dply/templates/deploy.erb
 - lib/dply/templates/pkgs.erb
 - lib/dply/todo
+- lib/dply/util.rb
+- lib/dply/venv.rb
 - lib/dply/version.rb
 - lib/dply/yum.rb
 - lib/dplyr/cli.rb
@@ -145,6 +141,42 @@ files:
 - lib/dplyr/stages_config.rb
 - lib/dplyr/task_runner.rb
 - lib/dplyr/tasks_config.rb
+- spec/dply/base_config_spec.rb
+- spec/dply/bundle_spec.rb
+- spec/dply/command_spec.rb
+- spec/dply/curl_spec.rb
+- spec/dply/deplist_spec.rb
+- spec/dply/elf_spec.rb
+- spec/dply/env_spec.rb
+- spec/dply/git_spec.rb
+- spec/dply/helper_spec.rb
+- spec/dply/linker_spec.rb
+- spec/dply/lock_spec.rb
+- spec/dply/pkgs_spec.rb
+- spec/dply/repo_spec.rb
+- spec/dply/rpm_spec.rb
+- spec/dply/yum_spec.rb
+- spec/integration/archive_flow_spec.rb
+- spec/integration/git_flow_spec.rb
+- spec/repo.rb
+- spec/spec_helper.rb
+- spec/test_data/build.tar.gz
+- spec/test_data/build.tar.gz.md5
+- spec/test_data/bundle/gems_installed/Gemfile
+- spec/test_data/bundle/gems_not_installed/Gemfile
+- spec/test_data/bundle/no_gemfile/.gitkeep
+- spec/test_data/command/test.rb
+- spec/test_data/elf/elf
+- spec/test_data/elf/libpgtypes.so.3
+- spec/test_data/elf/not_elf
+- spec/test_data/sample_repo/.dply.lock
+- spec/test_data/sample_repo/Gemfile
+- spec/test_data/sample_repo/Rakefile
+- spec/test_data/sample_repo/app.rb
+- spec/test_data/sample_repo/dply/app.rb
+- spec/test_data/sample_repo/lib/libacl.so.1
+- spec/test_data/sample_repo/pkgs.yml
+- spec/webserver.rb
 - test/sample_data/build.tar.gz
 - test/sample_data/build.tar.gz.md5
 - test/test_helper.rb
@@ -171,11 +203,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: rake based deploy tool
 test_files:
+- spec/dply/base_config_spec.rb
+- spec/dply/bundle_spec.rb
+- spec/dply/command_spec.rb
+- spec/dply/curl_spec.rb
+- spec/dply/deplist_spec.rb
+- spec/dply/elf_spec.rb
+- spec/dply/env_spec.rb
+- spec/dply/git_spec.rb
+- spec/dply/helper_spec.rb
+- spec/dply/linker_spec.rb
+- spec/dply/lock_spec.rb
+- spec/dply/pkgs_spec.rb
+- spec/dply/repo_spec.rb
+- spec/dply/rpm_spec.rb
+- spec/dply/yum_spec.rb
+- spec/integration/archive_flow_spec.rb
+- spec/integration/git_flow_spec.rb
+- spec/repo.rb
+- spec/spec_helper.rb
+- spec/test_data/build.tar.gz
+- spec/test_data/build.tar.gz.md5
+- spec/test_data/bundle/gems_installed/Gemfile
+- spec/test_data/bundle/gems_not_installed/Gemfile
+- spec/test_data/bundle/no_gemfile/.gitkeep
+- spec/test_data/command/test.rb
+- spec/test_data/elf/elf
+- spec/test_data/elf/libpgtypes.so.3
+- spec/test_data/elf/not_elf
+- spec/test_data/sample_repo/.dply.lock
+- spec/test_data/sample_repo/Gemfile
+- spec/test_data/sample_repo/Rakefile
+- spec/test_data/sample_repo/app.rb
+- spec/test_data/sample_repo/dply/app.rb
+- spec/test_data/sample_repo/lib/libacl.so.1
+- spec/test_data/sample_repo/pkgs.yml
+- spec/webserver.rb
 - test/sample_data/build.tar.gz
 - test/sample_data/build.tar.gz.md5
 - test/test_helper.rb

data/lib/dply/cli/app_task.rb

@@ -1,38 +0,0 @@
-require 'dply/helper'
-require 'dply/lock'
-require 'dply/tasks'
-require 'dply/config'
-
-module Dply
-  module Cli
-    class AppTask
-
-      include Helper
-
-      def initialize(argv)
-        @argv = argv
-      end
-
-      def run
-        task_name = @argv.shift
-        error "task name not specified" if not task_name
-        config
-        lock.acquire
-        Dir.chdir("current") { tasks.app_task task_name }
-      end
-
-      def tasks
-        @tasks ||= ::Dply::Tasks.new
-      end
-
-      def config
-        @config ||= Config.new.to_struct
-      end
-
-      def lock
-        @lock ||= Lock.new
-      end
-
-    end
-  end
-end

data/lib/dply/config.rb

@@ -1,120 +0,0 @@
-require 'dply/helper'
-require 'dply/config_struct'
-
-module Dply
-  class Config
-
-    include Helper
-    attr_reader :read_config
-
-    def initialize(dir = nil, read_config: true)
-      @dir = dir || Dir.pwd
-      @read_config = read_config
-    end
-
-    def to_struct
-      config
-    end
-
-    private 
-
-    def config
-      return @config if @config
-      @config = ConfigStruct.new(@dir)
-      read_from_file if read_config
-      return @config
-    end
-
-    def name(name)
-      set :name, name
-    end
-
-    def repo(repo)
-      set :repo, repo
-    end
-
-    def mirror(repo)
-      set :mirror, repo
-    end
-
-    def branch(branch)
-      set :branch, branch
-    end
-
-    def strategy(strategy)
-      set :strategy, strategy.to_sym
-    end
-
-    def target(target)
-      set :target, target
-    end
-
-    def shared_dirs(dirs)
-      raise if not dirs.is_a? Array
-      set :shared_dirs, dirs
-    end
-
-    def config_map(map)
-      set :config_map, map
-    end
-
-    def dir_map(map)
-      set :dir_map, map
-    end
-
-    def config_download_url(url)
-      set :config_download_url, url
-    end
-
-    def config_skip_download(list)
-      set :config_skip_download, list
-    end
-
-    def verify_checksum(verify_checksum)
-      set :verify_checksum, verify_checksum
-    end
-
-
-    def set(key, value)
-      method = "#{key}=".to_sym
-      @config.send method, value
-    end
-
-    def env(h)
-      raise if not h.is_a? Hash
-      h.each do |k,v|
-        ENV[k.to_s] = v.to_s
-      end
-    end
-
-    def config_file
-      @config_file ||= begin
-        found = ["#{@dir}/deploy.rb", "#{@dir}/dply.rb"].find { |f| File.readable? f }
-        found || "#{@dir}/deploy.rb"
-      end
-    end
-
-    def revision(revision)
-      set :revision, revision
-    end
-
-    def latest_revision(&block)
-      set :latest_revision, block
-    end
-
-    def build_url(&block)
-      set :build_url_proc, block
-    end
-
-    def read_from_file
-      if not File.readable? config_file
-        error "deploy.rb not found in #{@dir}"
-        return
-      end
-      instance_eval(File.read(config_file))
-    rescue NoMethodError => e
-      error "invalid option used in config: #{e.name}"
-    end
-  
-  end
-end