dply 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85a4c3a9c6317f7eb0c58b3f6e2ba5126015fb6
-  data.tar.gz: 0b8fb6959886ba99125fe7559510dd54180c92a1
+  metadata.gz: b6a7c74b1b9d89269d2b64c1a023c52a01d6f69a
+  data.tar.gz: a4cd0427ab1c9609a03e628e880d9877fd80bc9f
 SHA512:
-  metadata.gz: dae899e3f733399352bd7ac25ba0c473e56b8fb166fba1b9478e4461393752c0dcbc8266c43ce2c6bacc6573399f53240fecd3ca8670e824f1c3fcd6068a18c8
-  data.tar.gz: e21cf728a5340e980e98db23705c9d36a4382dd0e431841715931cfc60c4e6176787bf70660f68a4cfb8b1297e50a273815a503de9c7de64163eb50892f24469
+  metadata.gz: bfd678b1482e99e440dfa89edbcde8d533b3f3883f190e05a63f29d5e61f5be3f571f495924b59856e9d4c6c52a670f22c48a3ef5a78d648911960e620f73f5a
+  data.tar.gz: dcfdee4e48b8b322b0dec930765a1f4be090cec5ef7b8e1714ac8de995a6203db1ed8c91fe25db68d3aec8bd7e43ac5b2df3aabb9e2aa4bf4399efbfae47ed16

data/.gitignore

@@ -28,7 +28,7 @@ mkmf.log
 /test/tmp/
 /test/version_tmp/
 /tmp/
-
+*.swp
 ## Specific to RubyMotion:
 .dat*
 .repl_history

data/bin/drake

@@ -8,10 +8,13 @@ require 'optparse'
 require 'dply/error'
 require 'dply/version'
 require 'dply/logger'
+require 'dply/config'
 require 'pathname'
 
 logger = ::Dply::Logger.logger
-options = {}
+options = {
+  read_config: true
+}
 
 opts_parser = OptionParser.new do |opts| 
     
@@ -29,7 +32,11 @@ opts_parser = OptionParser.new do |opts|
       path = Pathname.new(d)
       raise ::Dply::Error, "deploy_dir path must be absolute" if path.relative?
       options[:deploy_dir] = path
-    end 
+    end
+
+    opts.on("--no-config", "Do not read config file") do
+      options[:read_config] = false
+    end
 
     opts.on("-v", "--version", "Show version") do |v|
       puts ::Dply::VERSION
@@ -57,12 +64,17 @@ begin
   opts_parser.order!(ARGV)
   deploy_dir = options[:deploy_dir] || Dir.pwd
   Dir.chdir deploy_dir
+  config = Dply::Config.new(deploy_dir, read_config: options[:read_config]).to_struct
 
   command = (ARGV.shift || "").to_sym
   case command
   when :deploy
     require 'dply/cli/deploy'
-    cli = Dply::Cli::Deploy.new(deploy_dir, ARGV)
+    cli = Dply::Cli::Deploy.new(deploy_dir, config, ARGV)
+    cli.run
+  when :reload
+    require 'dply/cli/reload'
+    cli = Dply::Cli::Reload.new(deploy_dir, config, ARGV)
     cli.run
   when :''
     puts opts_parser

data/docs/README

@@ -0,0 +1,38 @@
+directory structure when app is deployed using dplyr:
+
+/srv/app_user/app/
+├── config
+│   └── database.yml
+├── current -> repo
+├── dply.rb
+├── shared
+│   ├── log
+│   ├── public
+│   │   └── assets
+│   └── tmp
+│       ├── pids
+│       └── sockets
+├── repo
+│   ├── app
+│   ├── config
+│   │   └── database.yml -> ../../config/database.yml
+│   ├── config.ru
+│   ├── db
+|   ├── dply
+│   ├── Gemfile
+│   ├── Gemfile.lock
+│   ├── lib
+│   ├── log -> ../shared/log
+│   ├── public
+│   │   ├── assets -> ../../shared/public/assets
+│   ├── Rakefile
+│   ├── README.md
+│   ├── README.rdoc
+│   ├── tmp -> ../shared/tmp
+├── shared
+│   ├── log
+│   ├── public
+│   │   └── assets
+│   └── tmp
+│       ├── pids
+│       └── sockets

data/docs/dply.rb

@@ -0,0 +1,23 @@
+repo "git@github.com:user/repo.git"
+strategy :git
+target :production
+#create directories in shared/ dir
+shared_dirs [
+ "public/assets" 
+]
+
+# target(relative to repo root) => source(relative to shared/ dir)
+dir_map ({
+  "log" => "log",
+  "tmp" => "tmp",
+  "public/assets" => "public/assets"
+})
+
+# target(relative to repo root) => source(relative to config/ dir)
+config_map ({
+  "config/database.yml" => "database.yml",
+  "config/some_config" => "some_config"
+})
+
+config_download_url "http://127.0.0.1/prefix"
+config_skip_download ["some_config"]

data/docs/stages.rb

@@ -0,0 +1,8 @@
+stage :production do
+  user "dev"
+  ask :user # exported to env as DPLY_USER
+  deploy_dir "/home/dev/project"
+  parallel_runs 1
+  host "10.1.1.1", deploy_dir: "/home/dev/project1", id: "project1", user: "dev1"
+  host "10.1.1.2", deploy_dir: "/home/dev/project2", id: "project2"
+end

data/lib/dply/cli/deploy.rb

@@ -8,10 +8,11 @@ module Dply
 
       include Logger
 
-      attr_reader :deploy_dir, :argv
+      attr_reader :deploy_dir, :argv, :config
 
-      def initialize(deploy_dir, argv)
+      def initialize(deploy_dir, config, argv)
         @deploy_dir = deploy_dir
+        @config = config
         @argv = argv
       end
 
@@ -19,13 +20,13 @@ module Dply
         lock.acquire
         opts.parse!(argv)
         target = argv.shift
-        deploy.config.target = target if target
+        config.target = target if target
         deploy.options = options
         deploy.run
       end
 
       def deploy
-        @deploy ||= ::Dply::Deploy.new(deploy_dir)
+        @deploy ||= ::Dply::Deploy.new(deploy_dir, config)
       end
 
       def lock

data/lib/dply/cli/reload.rb

@@ -0,0 +1,58 @@
+require 'dply/reload'
+require 'dply/logger'
+require 'dply/lock'
+
+module Dply
+  module Cli
+    class Reload
+
+      include Logger
+
+      attr_reader :deploy_dir, :argv, :config
+
+      def initialize(deploy_dir, config, argv)
+        @deploy_dir = deploy_dir
+        @argv = argv
+        @config = config
+      end
+
+      def run
+        lock.acquire
+        opts.parse!(argv)
+        target = argv.shift
+        config.target = target if target
+        reload.options = options
+        reload.run
+      end
+
+      def reload
+        @reload ||= ::Dply::Reload.new(deploy_dir, config)
+      end
+
+      def lock
+        @lock ||= ::Dply::Lock.new(deploy_dir)
+      end
+
+      def opts
+        OptionParser.new do |opts|
+
+          opts.banner = "Usage: dply reload [options] [target]"
+          
+          opts.on("--skip-bundler", "Skip bundle install") do |e|
+            options[:skip_bundler] = true
+          end
+
+          opts.on("-h", "--help", "Help") do
+            puts opts
+            exit
+          end
+        end
+      end
+
+      def options
+        @options ||= {}
+      end
+
+    end
+  end
+end

data/lib/dply/config.rb

@@ -5,11 +5,11 @@ module Dply
   class Config
 
     include Helper
-    attr_reader :deploy_dir, :config_file_required
+    attr_reader :deploy_dir, :read_config
 
-    def initialize(deploy_dir, config_file_required: true)
+    def initialize(deploy_dir, read_config: true)
       @deploy_dir = deploy_dir
-      @config_file_required = config_file_required
+      @read_config = read_config
     end
 
     def config
@@ -24,9 +24,11 @@ module Dply
         link_config: false,
         config_map: nil,
         dir_map: nil,
-        shared_dirs: []
+        shared_dirs: [],
+        config_skip_download: [],
+        config_download_url: nil
       }
-      read_from_file
+      read_from_file if read_config
       return @config
     end
 
@@ -55,6 +57,16 @@ module Dply
       set :config_map, map
     end
 
+    def config_skip_download(list)
+      set :config_skip_download, list
+    end
+
+    def config_download_url(url)
+      set :config_download_url, url
+    end
+
+
+
     def dir_map(map)
       set :dir_map, map
     end
@@ -90,7 +102,7 @@ module Dply
 
     def read_from_file
       if not File.readable? config_file
-        raise error "dply.rb not found in #{deploy_dir}"  if config_file_required
+        raise error "dply.rb not found in #{deploy_dir}"
         return
       end
       instance_eval(File.read(config_file))

data/lib/dply/config_downloader.rb

@@ -0,0 +1,35 @@
+require 'dply/helper'
+module Dply
+  class ConfigDownloader
+
+    include Helper
+    attr_accessor :base_url, :config_files, :config_skip_download
+
+    def initialize(config_files , base_url, secret: nil, config_skip_download: [])
+      @config_files = config_files
+      @base_url = base_url
+      @secret = secret
+      @config_skip_download = config_skip_download
+    end
+
+    def download_all
+      config_files.each do |f|
+        if config_skip_download.include? f
+          logger.debug "skipping to download file #{f}"
+          next
+        end
+        download f
+      end
+    end
+
+    def download(file)
+      url = "#{base_url}/#{file}"
+      logger.bullet "downloading #{file}"
+      http_status = `curl -w "%{http_code}" -f -s -o 'config/#{file}' '#{url}' `
+      if http_status != "200"
+        raise error "failed to download #{file}, http status #{http_status}"
+      end
+    end
+
+  end
+end

data/lib/dply/deploy.rb

@@ -1,25 +1,21 @@
-require 'dply/setup'
 require 'dply/strategy'
 require 'dply/config'
 
 module Dply
   class Deploy
 
-    attr_reader :deploy_dir
+    attr_reader :deploy_dir, :config
     attr_writer :options
 
-    def initialize(deploy_dir)
+    def initialize(deploy_dir, config)
       @deploy_dir = deploy_dir
+      @config = config
     end
 
     def run
       strategy.deploy
     end
 
-    def config
-      @config ||= Config.new(deploy_dir).to_struct
-    end
-
     def strategy
       @strategy ||= Strategy.load(config, options)
     end

data/lib/dply/dplyr.rb

@@ -1,8 +1,12 @@
 require 'dply/stages_config'
 require 'dply/remote_task'
+require 'dply/logger'
+
 module Dply
   class Dplyr
 
+    include Logger
+
     attr_reader :stage, :argv
     def initialize(stage, argv)
       @stage = stage
@@ -10,11 +14,14 @@ module Dply
     end
 
     def run
+      global_switches = []
+      global_switches << "--debug" if  logger.debug?
       case stage
       when 'dev'
-        system "drake #{argv_str}"
+        global_switches << "--no-config"
+        system "drake #{global_switches.join(" ")} #{argv_str}"
       when 'local'
-        system "drake #{argv_str}"
+        system "drake #{global_switches.join(" ")} #{argv_str}"
       else
         run_remote_task
       end
@@ -32,12 +39,20 @@ module Dply
       stage_data[:parallel_runs]
     end
 
+    def env_str
+      str = ""
+      stage_data[:env].each do |k,v|
+        str << %(DPLY_#{k.upcase}="#{v}" )
+      end
+      str
+    end
+
     def argv_str
       @argv_str ||= argv.join(' ')
     end
 
     def run_remote_task
-      remote_task = ::Dply::RemoteTask.new(hosts, argv_str, parallel_jobs: parallel_jobs)
+      remote_task = ::Dply::RemoteTask.new(hosts, argv_str, parallel_jobs: parallel_jobs, env: env_str)
       remote_task.run
     end
 

data/lib/dply/git.rb

@@ -39,5 +39,11 @@ module Dply
      remote_url.chomp
     end
 
+    def self.commit_id
+      commit_id = cmd "git rev-parse HEAD", return_output: true, display: false
+      logger.debug commit_id.chomp
+      commit_id.chomp
+    end
+
   end
 end

data/lib/dply/linker.rb

@@ -4,52 +4,36 @@ module Dply
 
     include Helper
 
-    attr_reader :src_dir, :dest_dir, :map, :dir_prefix
+    attr_reader :src_dir, :dest_dir, :map
 
-    def initialize(src_dir, dest_dir, map: nil, dir_prefix: nil)
+    def initialize(src_dir, dest_dir, map: {})
       verify_absolute src_dir, dest_dir
       @src_dir = src_dir
       @dest_dir = dest_dir
       @map = map
-      @dir_prefix = dir_prefix
     end
     
     def create_symlinks
-      files.each do |f|
-        link_target = link_target(f)
-        absolute_source_path = absolute_source_path(f)
-        relative_path = absolute_source_path.relative_path_from link_target.parent
-        logger.debug "linking #{link_target} -> #{absolute_source_path}"
-        symlink(relative_path, link_target)
+      mapped_files.each do |f|
+        target = link_target(f)
+        source = link_source(f)
+        relative_source = link_relative_source(source, target)
+        logger.debug "linking #{target} -> #{source}"
+        symlink(relative_source, target)
       end
     end
 
-    def files
-      @map ? mapped_files : all_files
+    def link_target(relative_target)
+      Pathname.new "#{dest_dir}/#{relative_target}"
     end
 
-    def map
-      @map || default_map
+    def link_source(relative_target)
+      relative_source = map[relative_target]
+      Pathname.new "#{src_dir}/#{relative_source}"
     end
 
-    def link_target(relative_source)
-      target = map[relative_source]
-      Pathname.new "#{dest_dir}/#{target}"
-    end
-
-    def absolute_source_path(src)
-      Pathname.new "#{src_dir}/#{src}"
-    end
-
-
-    def default_map
-      @h ||= Hash.new do |hash, key|
-        dir_prefix ? "#{dir_prefix}/#{key}" : "#{key}"
-      end
-    end
-
-    def all_files
-      Dir.chdir(src_dir) { Dir.glob("*") }
+    def link_relative_source(source, target)
+      source.relative_path_from target.parent
     end
     
     def mapped_files

data/lib/dply/reload.rb

@@ -0,0 +1,29 @@
+require 'dply/strategy'
+require 'dply/config'
+
+module Dply
+  class Reload
+
+    attr_reader :deploy_dir, :config
+    attr_writer :options
+
+    def initialize(deploy_dir, config)
+      @deploy_dir = deploy_dir
+      @config = config
+    end
+
+    def run
+      strategy.reload
+    end
+    
+    def strategy
+      @strategy ||= Strategy.load(config, options)
+    end
+
+    def options
+      @options ||= {}
+    end
+
+
+  end
+end

data/lib/dply/remote_task.rb

@@ -7,12 +7,13 @@ module Dply
 
     include Logger
     
-    attr_reader :hosts, :parallel_jobs, :task
+    attr_reader :hosts, :parallel_jobs, :task, :env
 
-    def initialize(hosts, task, parallel_jobs: 1)
+    def initialize(hosts, task, parallel_jobs: 1, env: "")
       @hosts = hosts
       @parallel_jobs = parallel_jobs
       @task = task
+      @env = env
     end
 
     def run
@@ -78,9 +79,9 @@ module Dply
       host = host_info[:host]
       deploy_dir = host_info[:deploy_dir]
       if logger.debug?
-        %(ssh -tt -oBatchMode=yes -l #{user} #{host} "drake --debug -d #{deploy_dir} #{task} 2>&1")
+        %(ssh -tt -oBatchMode=yes -l #{user} #{host} "#{env} drake --debug -d #{deploy_dir} #{task} 2>&1")
       else
-        %(ssh -tt -oBatchMode=yes -l #{user} #{host} "drake -d #{deploy_dir} #{task} 2>&1" 2>/dev/null)
+        %(ssh -tt -oBatchMode=yes -l #{user} #{host} "#{env} drake -d #{deploy_dir} #{task} 2>&1" 2>/dev/null)
       end
     end
 

data/lib/dply/shell.rb

@@ -5,17 +5,18 @@ module Dply
 
     include Logger
 
-    def cmd(command, display: true, error_msg: nil, return_output: false)
+    def cmd(command, display: true, error_msg: nil, return_output: false, env:{})
+      stringify_values(env)
       if display
         puts "#{"\u2219".bold.blue} #{command}"
       else
         logger.debug command
       end
       if return_output
-        output = `#{command}`
+        output = `#{env_str(env)} #{command}`
       else
         output = ""
-        system "#{command} 2>&1"
+        system env, "#{command} 2>&1"
       end 
       return_value = $?.exitstatus
       error_msg ||= "non zero exit for \"#{command}\""
@@ -43,5 +44,19 @@ module Dply
       symlink src, dst
     end
 
+    def env_str(env)
+      str = ""
+      env.each do |k,v|
+        str << %(#{k}="#{v.to_s}")
+      end
+      str
+    end
+
+    def stringify_values(hash)
+      hash.each do |k,v|
+        hash[k] = v.to_s
+      end
+    end
+
   end
 end

data/lib/dply/stages_config.rb

@@ -35,7 +35,7 @@ module Dply
         host: host,
         user: user || get_from_current_stage(:user),
         deploy_dir: deploy_dir || get_from_current_stage(:deploy_dir),
-        id: id || "unnamed"
+        id: id || host
       }
       hosts << host_info
     end
@@ -72,10 +72,19 @@ module Dply
       end
     end
 
+    def ask(key)
+      print "Enter #{key}: "
+      value = STDIN.gets.chomp
+      env = get_from_current_stage(:env)
+      env[key] = value
+    end
+
     def init_stage(name)
-      stages[name] = {}
-      stages[name][:hosts] = []
-      stages[name][:parallel_runs] = 1
+      stages[name] = {
+        hosts: [],
+        parallel_runs: 1,
+        env: {}
+      }
     end
 
 

data/lib/dply/strategy/default.rb

@@ -26,6 +26,13 @@ module Dply
 
       end
 
+      def reload
+        Dir.chdir deploy_dir do
+          git_step
+          tasks.reload config.target
+        end
+      end
+
       private
 
       def deploy_dir

data/lib/dply/strategy/git.rb

@@ -1,6 +1,7 @@
 require 'dply/helper'
 require 'dply/setup'
 require 'dply/linker'
+require 'dply/config_downloader'
 require 'forwardable'
 
 
@@ -12,7 +13,9 @@ module Dply
       include Helper
 
       def_delegators :config, :target, :branch, :link_config,
-                              :config_dir, :config_map, :dir_map
+                     :config_dir, :config_map, :dir_map, :config_skip_download,
+                     :config_download_url
+                
       
       attr_reader :config, :options
 
@@ -23,17 +26,31 @@ module Dply
 
       def deploy
         setup.run
+        config_downloader.download_all if config_download_url
         Dir.chdir current_dir do
+          previous_version = git.commit_id
           git_step
+          current_version = git.commit_id
           link_dirs
           link_config_files
-          tasks.deploy target
+          env = {
+            "DPLY_PREVIOUS_VERSION" => previous_version,
+            "DPLY_CURRENT_VERSION" => current_version
+          }
+          tasks.deploy target, env: env
         end
       end
 
       def switch
       end
 
+      def reload
+        config_downloader.download_all if config_download_url
+        Dir.chdir current_dir do
+          tasks.reload target
+        end
+      end
+
       private
 
       def current_dir
@@ -63,10 +80,13 @@ module Dply
 
       def config_linker
         return @config_linker if @config_linker
-        dir_prefix = config_dir || "config"
         source = "#{config.deploy_dir}/config"
         dest = current_dir
-        @config_linker ||= ::Dply::Linker.new(source, dest, map: config_map, dir_prefix: dir_prefix)
+        @config_linker ||= ::Dply::Linker.new(source, dest, map: config_map)
+      end
+
+      def config_downloader
+        @config_downloader = ::Dply::ConfigDownloader.new(config_map.values.uniq, config_download_url, config_skip_download: config_skip_download)
       end
 
       def dir_linker

data/lib/dply/tasks.rb

@@ -4,14 +4,21 @@ module Dply
 
     include Shell
 
-    def deploy(target)
+    def deploy(target, env:{})
+      env.merge!(env_from_yml)
       bundle_install
-      cmd "#{rake_command} #{target}:deploy"
+      cmd "#{rake_command} #{target}:deploy", env: env
     end
 
-    def switch(target)
+    def switch(target, env:{})
+      env.merge!(env_from_yml)
       bundle_install
-      cmd "#{rake_command} #{target}:switch"
+      cmd "#{rake_command} #{target}:switch", env: env
+    end
+
+    def reload(target)
+      bundle_install
+      cmd "#{rake_command} #{target}:reload", env: env_from_yml
     end
 
     def gemfile_exists?
@@ -33,5 +40,16 @@ module Dply
       cmd "bundle install"
     end
 
+    def env_from_yml
+      path = "config/env.yml"
+      if not File.readable? path
+        logger.debug "skipped loading env from #{path}"
+        return {}
+      end
+      require 'yaml'
+      YAML.load_file(path)
+    end
+
+
   end
 end

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,10 +55,15 @@ files:
 - bin/drake
 - code_dump/alt_remote_task.rb
 - code_dump/old_remote_task.rb
+- docs/README
+- docs/dply.rb
+- docs/stages.rb
 - dply.gemspec
 - lib/dply.rb
 - lib/dply/cli/deploy.rb
+- lib/dply/cli/reload.rb
 - lib/dply/config.rb
+- lib/dply/config_downloader.rb
 - lib/dply/custom_logger.rb
 - lib/dply/deploy.rb
 - lib/dply/dplyr.rb
@@ -70,6 +75,7 @@ files:
 - lib/dply/lock.rb
 - lib/dply/logger.rb
 - lib/dply/release.rb
+- lib/dply/reload.rb
 - lib/dply/remote_task.rb
 - lib/dply/repo.rb
 - lib/dply/report.rb