dply 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ac3b7f967497f1b85a16415990df69b0c854ea
-  data.tar.gz: a2d8d0a195d3c349a3be0582b9ca35e1e18879ab
+  metadata.gz: 0b92068ab55eafbf6251279196b55c8dedcb8b08
+  data.tar.gz: 08e8ee5fd0e739197dd3ec897c21a2102439cf3d
 SHA512:
-  metadata.gz: d4a575b0bfc3733134a6d70d9a271e14c672318948c0f665f408134f01de953dfb8f62182392040f0dcbde5e9c2566c30b1f7e2381ee1629951b0159f8547aef
-  data.tar.gz: 01cc78729016a11518d3c5d3becfdd610509f76587ccf1d3e20df7547c0f10fbb2b7fc50a1144c75c59784f9e9a6ee233b17b3eafafd96719f8915f2918bbba4
+  metadata.gz: bad31ba97e20aa346f11f350921ad494df4cadfb0faface670155e9850db6d34b91add5c4c7a6f26c74c92ea58c5158af215da5685718eceb66cf457bb350c40
+  data.tar.gz: aea742ad3329712c64fe9ede87e43c65196ce4ae6f0801a3c489e1b60c77a2a67c1b1b611f02246641dbf3f7b44ba0b6c579fdb8d7569ef815d80af483dd71aa

data/Rakefile

@@ -7,3 +7,9 @@ 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

data/lib/dply/build.rb

@@ -12,7 +12,7 @@ module Dply
     extend Forwardable
     include Helper
 
-    def_delegators :config, :target, :branch, :config_download_url,
+    def_delegators :config, :branch, :config_download_url,
                           :config_map, :dir_map, :config_skip_download
 
     attr_reader :config

data/lib/dply/build_config.rb

@@ -15,7 +15,7 @@ module Dply
       return @config if @config
       @config = {
         dir: @dir,
-        task: "build:default",
+        task: "app:build",
         branch: :master,
         repo: nil,
         git: true,

data/lib/dply/cli/devbuild.rb

@@ -25,7 +25,7 @@ module Dply
 
         clear_bundle_config
         tasks.install_pkgs(build_mode: true, use_yum: @options[:use_yum])
-        tasks.build "build:default"
+        tasks.build "app:build"
       ensure
         clear_bundle_config
       end

data/lib/dply/cli/setup.rb

@@ -19,13 +19,7 @@ module Dply
         return if not proceed?
         lock.acquire
         setup_default
-        namespace = @argv.shift
-        if namespace
-          setup_task(namespace)
-        else
-          setup_build_task
-          setup_task(:production)
-        end
+        setup_app_rake
       end
 
       def proceed?
@@ -37,9 +31,9 @@ module Dply
       def setup_default
         if not File.exist? "dply"
           FileUtils.mkdir_p "dply"
-          logger.info "created dply/ dir"
+          logger.info "created dply/"
         else
-          logger.info "skipping dply/ dir"
+          logger.info "skipping dply/"
         end
 
         rakefile = "dply/Rakefile"
@@ -59,23 +53,16 @@ module Dply
         end
       end
 
-      def setup_task(namespace, template: "deploy.erb")
-        tasks_file = "dply/#{namespace}.rake"
+      def setup_app_rake
+        tasks_file = "dply/app.rake"
         if File.exist? tasks_file
           logger.info "skipping #{tasks_file}"
           return
         end
-        b = binding
-        template_path = "#{templates_dir}/#{template}"
-        erb = ERB.new(File.read(template_path), nil, '-')
-        File.open(tasks_file, 'w') { |f| f.write erb.result(b) }
+        FileUtils.cp "#{templates_dir}/deploy.erb", tasks_file
         logger.info "created #{tasks_file}"
       end
 
-      def setup_build_task
-        setup_task("build", template: "build.erb")
-      end
-
       def templates_dir
         @templates_dir ||= "#{__dir__}/../templates"
       end
@@ -96,7 +83,6 @@ module Dply
         end
       end
 
-
     end
   end
 end

data/lib/dply/config_struct.rb

@@ -11,7 +11,7 @@ module Dply
 
     def initialize(dir = nil)
       @dir = dir || Dir.pwd
-      @target = :default
+      @target = nil
       @branch = :master
       @verify_checksum = true
       @shared_dirs = []

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 :archive
+          tasks.deploy deploy_target
         end
         release.record_deployment
         current_version = get_release
@@ -56,16 +56,12 @@ module Dply
         end
       end
 
-      def reopen_logs
-        Dir.chdir(current_dir) { tasks.rake "#{target}:reopen_logs" }
-      end
+      private
 
-      def task(task_name)
-        Dir.chdir(current_dir) { tasks.task task_name }
+      def deploy_target
+        @deploy_target ||= (target || :archive)
       end
 
-      private
-
       def current_dir
         @current_dir ||= "#{config.dir}/current"
       end

data/lib/dply/strategy/git.rb

@@ -24,6 +24,7 @@ module Dply
       end
 
       def deploy
+        deploy_target = (target || :git)
         setup.git
         download_configs if config_download_url
         Dir.chdir current_dir do
@@ -32,7 +33,7 @@ module Dply
           current_version = git.commit_id
           link_all
           install_pkgs
-          tasks.deploy :git
+          tasks.deploy deploy_target
           tasks.report_changes(previous_version, current_version)
         end
       end
@@ -45,14 +46,6 @@ module Dply
         end
       end
 
-      def reopen_logs
-        Dir.chdir(current_dir) { tasks.rake "#{target}:reopen_logs" }
-      end
-
-      def task(task_name)
-        Dir.chdir(current_dir) { tasks.task task_name }
-      end
-
       private
 
       def current_dir

data/lib/dply/tasks.rb

@@ -15,22 +15,31 @@ module Dply
       rake_runner "app:test:#{target}", optional: optional
     end
 
-    def build(target)
-      task = target ? "app:build:#{target}" : "app:build"
+    def build(task)
+      fallback_task = "build:default"
       bundle.install
       bundle.clean
-      rake_runner task
+      rake_runner task, fallback_task
     end
 
-    def deploy(strategy, target: nil)
-      task = target ? "app:deploy:#{target}" : "app:deploy:#{strategy}"
+    def deploy(target)
+      fallback_task = "production:deploy"
+      task = "app:deploy:#{target}"
       bundle.install
-      rake_runner task
+      rake_runner task, fallback_task
     end
 
     def reload
+      fallback_task = "production:reload"
+      task = "app:reload"
       bundle.install
-      rake_runner "app:reload"
+      rake_runner task, fallback_task
+    end
+
+    def reopen_logs
+      fallback_task = "production:reopen_logs"
+      task = "app:reopen_logs"
+      rake_runner task, fallback_task
     end
 
     def stop

data/lib/dply/templates/deploy.erb

@@ -1,6 +1,18 @@
-namespace :<%= namespace %> do
+namespace :app do
 
-  task :deploy do
+  task :test do
+
+  end
+
+  task :build do
+
+  end
+
+  task "deploy:git" do
+
+  end
+
+  task "deploy:archive" do
 
   end
 
@@ -11,5 +23,9 @@ namespace :<%= namespace %> do
   task :reopen_logs do
 
   end
-  
+
+  task :stop do
+
+  end
+
 end

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.2.11"
+  VERSION = "0.2.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf