dply 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b94754956a775ca1df63d06773ea95a31b43164
-  data.tar.gz: 13a8c55759e75314ebe495b5d0757956a3f0b37a
+  metadata.gz: c60a81b81642343a48a22ff3931e504c51dd3ec1
+  data.tar.gz: f679ecc74ae8843de5fb1e6f6fd17a4dd3abef71
 SHA512:
-  metadata.gz: a7b8f2d51c35775798a8b11a9f7a403b6dfa251f4e1defe77fb4776e7ed45bc7601b1c391aee6b638d295241c22bea6bd89a4bae39cfce072f394ce83604ec7d
-  data.tar.gz: f25433e4f12149ff3ac31357c1838309da4564794e640e596f1b4e7725d53879600bd0b1b4a3b46509cdf4a6d1406576529b9d922723458fb0e15d812f1077ca
+  metadata.gz: e61c97e9aac65f8f97e392bd145205f1e922b0b6cd7e21f8b74854ea154e02557b542c55b6949d54cb22133f2d115f3884455fb1dfae43a295481f30b65b0cc3
+  data.tar.gz: 58dd1abb7a93aa5cbb948d0a2599f215481a4cf03690da4448f3b21d2b67bfffa0bdce9a95a95db4ddebb85936e7ac0fdcb4d794407b24a0d9806b7f0a50e485

data/bin/drake

@@ -73,13 +73,17 @@ begin
 
   command = (ARGV.shift || "").to_sym
   case command
-  when :deploy, :reload, :task,
-       :build, :depcheck, :"install-pkgs", :reopen_logs,
+  when :deploy, :task, :app_task,
+       :build, :depcheck, :"install-pkgs",
        :status, :devbuild, :setup
     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
+    ::Dply::Tasks.new.rake command.to_s
   when :''
     puts opts_parser
   else

data/dply.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   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.6"
+  spec.add_dependency "ruby-filemagic", "~> 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/dply/bundle.rb

@@ -1,6 +1,7 @@
 require 'dply/helper'
 require 'fileutils'
 require 'yaml'
+require 'shellwords'
 
 module Dply
   class Bundle
@@ -13,12 +14,11 @@ module Dply
       cmd "bundle install -j5 --deployment"
     end
 
-    def rake(task, **args)
-      if gemfile_exists?
-        cmd "bundle exec rake -Nf dply/Rakefile -R dply #{task}", env: env
-      else
-        cmd "rake -Nf dply/Rakefile -R dply #{task}", env: env
-      end
+    def rake(task)
+      rakelib = Shellwords.shellescape "#{__dir__}/rakelib"
+      rake_cmd = %(rake -R #{rakelib} -Nf dply/Rakefile #{task})
+      command = gemfile_exists? ? "bundle exec #{rake_cmd}" : rake_cmd
+      cmd command, env: env, display: false
     end
 
     def clean
@@ -39,7 +39,6 @@ module Dply
       end
     end
 
-
     def check
       system "bundle check > /dev/null"
     end

data/lib/dply/cli/{reload.rb → app_task.rb}

@@ -1,25 +1,28 @@
-require 'dply/logger'
+require 'dply/helper'
 require 'dply/lock'
-require 'dply/strategy'
+require 'dply/tasks'
 require 'dply/config'
 
 module Dply
   module Cli
-    class Reload
+    class AppTask
 
-      include Logger
+      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
-        strategy.reload
+        Dir.chdir("current") { tasks.app_task task_name }
       end
 
-      def strategy
-        @strategy ||= Strategy.load(config, {})
+      def tasks
+        @tasks ||= ::Dply::Tasks.new
       end
 
       def config

data/lib/dply/cli/ctl.rb

@@ -0,0 +1,40 @@
+require 'dply/lock'
+require 'dply/strategy'
+require 'dply/config'
+require 'dply/tasks'
+
+module Dply
+  module Cli
+    class Ctl
+
+      def run(command)
+        case command
+        when :start, :stop, :reopen_logs
+          config
+          lock.acquire
+          Dir.chdir("current") { tasks.send command.to_sym }
+        when :reload
+          lock.acquire
+          strategy.reload
+        end
+      end
+
+      def strategy
+        @strategy ||= Strategy.load(config, {})
+      end
+
+      def config
+        @config ||= Config.new.to_struct
+      end
+
+      def lock
+        @lock ||= Lock.new
+      end
+
+      def tasks
+        @tasks ||= ::Dply::Tasks.new
+      end
+
+    end
+  end
+end

data/lib/dply/helper.rb

@@ -7,22 +7,28 @@ module Dply
   module Helper
 
     def cmd(command, display: true, error_msg: nil, return_output: false, env:{}, shell: false)
+      if command.is_a? Array
+        command_arr = command
+        command_str = command.join(" ")
+      else
+        command_arr = %W(#{command})
+        command_str = command
+      end
       stringify_values!(env)
       if display
-        logger.bullet command
+        logger.bullet command_str
       else
-        logger.debug command
+        logger.debug command_str
       end
-      command_arr = command.split
-      run_command = shell ? command : command_arr
 
+      run_command = shell ? command_str : command_arr
       output = if return_output
         IO.popen(env, run_command) { |f| f.read }
       else
         system(env, *run_command, 2 => 1)
       end
       return_value = $?.exitstatus
-      error_msg ||= "non zero exit for \"#{command}\""
+      error_msg ||= "non zero exit for \"#{command_str}\""
       error error_msg if return_value != 0
       return output
     end

data/lib/dply/rakelib/drake.rake

@@ -0,0 +1,33 @@
+require_relative '../ext/string'
+
+def load_app_rakefile
+  @app_rakefile_loaded ||= begin
+    load './Rakefile'
+  end
+end
+
+namespace :drake do
+  desc "task runner to optionally invoke tasks"
+  task :runner do
+    runner_tasks = ENV["runner_tasks"] || ""
+    optional = ENV["runner_optional"]
+    app_task = ENV["runner_app_task"]
+
+    load_app_rakefile if app_task
+    tasks = runner_tasks.split(',')
+    task = tasks.find { |i| Rake::Task.task_defined? i}
+
+    if task
+      puts "#{"\u2219".bold.yellow} #{task}"
+      Rake::Task[task].invoke
+    else
+      if optional
+        puts "#{"WARN".yellow} any of the tasks not found: #{tasks}"
+      else
+        abort "#{"ERROR".red} any of the required tasks not defined: #{tasks}"
+      end
+    end
+  end
+end
+
+Dir.glob('dply/*.rake').each { |r| load r}

data/lib/dply/rpm.rb

@@ -22,8 +22,8 @@ module Dply
 
     def whatprovides(lib)
       lib = "#{lib}()(64bit)"
-      command = %(rpm --queryformat "%{NAME} " -q --whatprovides "#{lib}")
-      output = cmd command, return_output: true, shell: true, display: false
+      command = ["rpm", "--queryformat", "%{NAME} ", "-q", "--whatprovides", lib]
+      output = cmd command, return_output: true, display: false
       list = output.strip.split.select {|pkg| not filtered? pkg }
     end
 

data/lib/dply/strategy/archive.rb

@@ -40,7 +40,7 @@ module Dply
         previous_version = get_release
         release.make_current
         Dir.chdir current_dir do
-          tasks.deploy target
+          tasks.deploy :archive
         end
         release.record_deployment
         current_version = get_release
@@ -52,7 +52,7 @@ module Dply
         download_configs if config_download_url
         Dir.chdir current_dir do
           link_all
-          tasks.reload target
+          tasks.reload
         end
       end
 
@@ -100,15 +100,6 @@ module Dply
         end
       end
 
-      def git_step
-        return if options[:skip_git]
-        if options[:no_pull]
-          git.checkout branch
-        else
-          git.pull branch
-        end
-      end
-
       def link_all
         tasks.link "#{config.dir}/shared", dir_map
         tasks.link "#{config.dir}/config", config_map

data/lib/dply/strategy/git.rb

@@ -32,7 +32,7 @@ module Dply
           current_version = git.commit_id
           link_all
           install_pkgs
-          tasks.deploy target
+          tasks.deploy :git
           tasks.report_changes(previous_version, current_version)
         end
       end
@@ -41,7 +41,7 @@ module Dply
         download_configs if config_download_url
         Dir.chdir current_dir do
           link_all
-          tasks.reload target
+          tasks.reload
         end
       end
 

data/lib/dply/tasks.rb

@@ -10,29 +10,46 @@ module Dply
 
     include Helper
 
-    def deploy(target)
+    def test(target, optional: false)
       bundle.install
-      rake "#{target}:deploy"
+      rake_runner "app:test:#{target}", optional: optional
     end
 
-    def reload(target)
+    def build(target)
+      task = target ? "app:build:#{target}" : "app:build"
       bundle.install
-      rake "#{target}:reload"
+      bundle.clean
+      rake_runner task
     end
 
-    def task(task)
+    def deploy(strategy, target: nil)
+      task = target ? "app:deploy:#{target}" : "app:deploy:#{strategy}"
       bundle.install
-      rake task
+      rake_runner task
     end
 
-    def build(task)
+    def reload
       bundle.install
-      bundle.clean
-      rake task
+      rake_runner "app:reload"
+    end
+
+    def stop
+      bundle.install
+      rake_runner "app:stop"
+    end
+
+    def app_task(task)
+      bundle.install
+      rake_runner task, app_task: true
+    end
+
+    def task(task)
+      bundle.install
+      rake_runner task
     end
 
     def rake(task)
-      bundle.rake task
+      rake_runner task
     end
 
     def report_changes(previous_version, current_version)
@@ -64,6 +81,14 @@ module Dply
 
     private
 
+    def rake_runner(*tasks, optional: false, app_task: false)
+      runner_tasks = tasks.map(&:strip).join(",")
+      s =  "drake:runner runner_tasks=#{runner_tasks}"
+      s << " runner_optional=true" if optional
+      s << " runner_app_task=true" if app_task
+      bundle.rake s
+    end
+
     def bundle
       @bundle ||= Bundle.new
     end

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,13 +95,13 @@ files:
 - 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/reload.rb
-- lib/dply/cli/reopen_logs.rb
 - lib/dply/cli/setup.rb
 - lib/dply/cli/status.rb
 - lib/dply/cli/task.rb
@@ -120,6 +120,7 @@ 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/repo.rb
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: rake based deploy tool

data/lib/dply/cli/reopen_logs.rb

@@ -1,35 +0,0 @@
-require 'dply/logger'
-require 'dply/lock'
-require 'dply/strategy'
-require 'dply/config'
-
-module Dply
-  module Cli
-    class ReopenLogs
-
-      include Logger
-
-      def initialize(argv)
-        @argv = argv
-      end
-
-      def run
-        lock.acquire
-        strategy.reopen_logs
-      end
-
-      def strategy
-        @strategy ||= Strategy.load(config, {})
-      end
-
-      def config
-        @config ||= Config.new.to_struct
-      end
-
-      def lock
-        @lock ||= Lock.new
-      end
-
-    end
-  end
-end