sumodev 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d56d896a70dd7ae7a31cd10e685f81bf8990d4
-  data.tar.gz: b36774176b3439d4d2fb20bb05fbc0aa1933db17
+  metadata.gz: b76c8021b88540087b06d6db8def2031bc8caca6
+  data.tar.gz: b5d283150c9d3e43c17132aeb2c2cbbcde3ca669
 SHA512:
-  metadata.gz: 78b4fc8002008e05a4c9d4801c683462b85765d4434e8da2d1a09e97d7741f95f9fe1b9233ec2f88bb3aaba0867534d64387e467ec2b5eced095036802f3973b
-  data.tar.gz: 40c63fb7a1c6adf7c6eb4a0cbf4bba7c33336b3e8ab4d61b5f154eebd8f346233f25cdfbb3119d473392dec156a187aef02f1dc331a52fdbd98354bbe7e8717c
+  metadata.gz: 1f04e5008f84998df569567cbaf42e035e9554b2919707d1265051b161e4f46e87d5e0ac57a46e8ca208c6b39f1558d3571a18adceb146d9e3a611e6f2e146bb
+  data.tar.gz: 2d2d98eef7f47c78d2a92cccd8a598b9257bd2c1b952dfc157766ae8eb6a0e47f71867f3a3c28e9d5675205bdba6bf1e4838e39841de5f6ad09d2b767c127b58

data/lib/sumodev/command.rb

@@ -1,5 +1,53 @@
+require 'open3'
+
 class Sumodev::Command < Thor
   def self.banner(task, namespace = true, subcommand = false)
     "#{basename} #{task.formatted_usage(self, true, subcommand)}"
   end
+
+  no_commands do
+    def run_command_without_output(cmd, in_dir = nil, message = nil, verbose = false)
+      if !message.nil?
+        say message, :green
+      end
+
+      if cmd.kind_of?(Array)
+        real_cmd = cmd.join('; ')
+      else
+        real_cmd = cmd
+      end
+
+      if !in_dir.nil?
+        real_cmd = "cd #{in_dir}; #{real_cmd}"
+      end
+
+      out, error, status = Open3.capture3(real_cmd)
+
+      puts out if verbose
+      raise error if status != 0
+
+      return CommandOutput.new out, error, status
+    end
+
+    def continue?(message)
+      ask colorize("#{message}\nPress a key to continue\n")
+    end
+
+    def colorize(message)
+      message = message
+      .gsub(/\*(.*)\*/) { "\033[33m\033[1m#{$1}\033[22m\033[0m" }
+
+      return message
+    end
+  end
+end
+
+class CommandOutput
+  attr_reader :out, :error, :status
+
+  def initialize(out, error, status)
+    @out = out
+    @error = error
+    @status = status
+  end
 end

data/lib/sumodev/commands/box.rb

@@ -1,95 +1,95 @@
-require 'sumodev/command'
-require 'sumodev/config'
-require 'sumodev/sumofile'
-
-class Sumodev::Commands::Box < Sumodev::Command
-  namespace :box
-
-  no_commands do
-    def box_path
-      possible_paths = [
-        Dir.pwd,
-        Sumodev::Config.get('SUMO_VAGRANT_PATH')
-      ]
-
-      vagrantfile = possible_paths.detect do |path|
-        File.file?(File.join(File.expand_path(path), "Vagrantfile"))
-      end || raise("No Vagrant file found in #{possible_paths.join(', ')}")
-
-      File.expand_path(vagrantfile)
-    end
-
-    def run_vagrant_command(command, *arguments)
-      # See https://github.com/mitchellh/vagrant/issues/5199#issuecomment-73278236
-      if ["reload", "halt"].include?(command.split(" ")[0])
-        system "rm -rf #{box_path}/.vagrant/machines/*/virtualbox/synced_folders"
-      end
-      system "cd #{box_path}; vagrant #{command} #{arguments.join(' ')}"
-    end
-
-    def box_running?
-      output = `cd #{box_path}; vagrant status`
-      output =~ /The VM is running/
-    end
-
-    def configure_port_mapping
-      return unless Sumodev::Config.true?('SUMO_FORWARD_PORTS')
-      system "sudo pfctl -f /etc/pf.conf"
-    end
-
-    def convert_sumofile_into_env_variables
-      sumofile_path = Dir.pwd + "/Sumofile"
-
-      file = Sumodev::Sumofile.from_file sumofile_path
-      file.convert_into_json_file
-    end
-  end
-
-  desc 'up', "Starts the Vagrant-box"
-  def up
-    say("There is already a box running, you should manually start the box. Or halt the running instance", :red) && exit(1) if box_running?
-
-    convert_sumofile_into_env_variables
-    configure_port_mapping
-    run_vagrant_command("up", "--provision")
-  rescue Sumodev::Sumofile::NoSuchFileError
-    say("No Sumofile found! Please define one so the correct versions will be used!", :red) && exit(1)
-  end
-
-  desc 'install', "Installs everything required to use the box command"
-  def install
-    # install vagrant plugins
-    %x(vagrant plugin install vagrant-omnibus)
-    %x(vagrant plugin install vagrant-vbguest)
-    %x(vagrant plugin install vagrant-berkshelf --plugin-version 2.0.1)
-    %x(berks vendor berks-cookbooks)
-
-    # install .sumorc file
-    File.open(File.expand_path("~/.sumorc"), 'w') do |f|
-      f.write <<-SUMORC
-        export SUMO_VAGRANT_PATH=""
-SUMORC
-    end unless File.exists?(File.expand_path("~/.sumorc"))
-
-    # setup resolver
-    File.open("/tmp/vagrant-resolver", 'w') do |f|
-      f.write <<-RESOLVER
-# Created by sumo command
-nameserver 10.11.12.13
-port 53
-      RESOLVER
-    end
-
-    %x(sudo mv /tmp/vagrant-resolver /etc/resolver/vagrant)
-  end
-
-  # Vagrant commands
-  %w(halt provision resume reload ssh status suspend).each do |method|
-    class_eval <<-VAGRANT_METHOD
-      desc '#{method}', 'Runs the #{method} vagrant command'
-      def #{method}(*args)
-        run_vagrant_command("#{method} \#{args.join(' ')}")
-      end
-    VAGRANT_METHOD
-  end
-end
+require 'sumodev/command'
+require 'sumodev/config'
+require 'sumodev/sumofile'
+
+class Sumodev::Commands::Box < Sumodev::Command
+  namespace :box
+
+  no_commands do
+    def box_path
+      possible_paths = [
+        Dir.pwd,
+        Sumodev::Config.get('SUMO_VAGRANT_PATH')
+      ]
+
+      vagrantfile = possible_paths.detect do |path|
+        File.file?(File.join(File.expand_path(path), "Vagrantfile"))
+      end || raise("No Vagrant file found in #{possible_paths.join(', ')}")
+
+      File.expand_path(vagrantfile)
+    end
+
+    def run_vagrant_command(command, *arguments)
+      # See https://github.com/mitchellh/vagrant/issues/5199#issuecomment-73278236
+      if ["reload", "halt"].include?(command.split(" ")[0])
+        system "rm -rf #{box_path}/.vagrant/machines/*/virtualbox/synced_folders"
+      end
+      system "cd #{box_path}; vagrant #{command} #{arguments.join(' ')}"
+    end
+
+    def box_running?
+      output = `cd #{box_path}; vagrant status`
+      output =~ /The VM is running/
+    end
+
+    def configure_port_mapping
+      return unless Sumodev::Config.true?('SUMO_FORWARD_PORTS')
+      system "sudo pfctl -f /etc/pf.conf"
+    end
+
+    def convert_sumofile_into_env_variables
+      sumofile_path = Dir.pwd + "/Sumofile"
+
+      file = Sumodev::Sumofile.from_file sumofile_path
+      file.convert_into_json_file
+    end
+  end
+
+  desc 'up', "Starts the Vagrant-box"
+  def up
+    say("There is already a box running, you should manually start the box. Or halt the running instance", :red) && exit(1) if box_running?
+
+    convert_sumofile_into_env_variables
+    configure_port_mapping
+    run_vagrant_command("up", "--provision")
+  rescue Sumodev::Sumofile::NoSuchFileError
+    say("No Sumofile found! Please define one so the correct versions will be used!", :red) && exit(1)
+  end
+
+  desc 'install', "Installs everything required to use the box command"
+  def install
+    # install vagrant plugins
+    %x(vagrant plugin install vagrant-omnibus)
+    %x(vagrant plugin install vagrant-vbguest)
+    %x(vagrant plugin install vagrant-berkshelf)
+    %x(berks vendor berks-cookbooks)
+
+    # install .sumorc file
+    File.open(File.expand_path("~/.sumorc"), 'w') do |f|
+      f.write <<-SUMORC
+        export SUMO_VAGRANT_PATH=""
+SUMORC
+    end unless File.exists?(File.expand_path("~/.sumorc"))
+
+    # setup resolver
+    File.open("/tmp/vagrant-resolver", 'w') do |f|
+      f.write <<-RESOLVER
+# Created by sumo command
+nameserver 10.11.12.13
+port 53
+      RESOLVER
+    end
+
+    %x(sudo mv /tmp/vagrant-resolver /etc/resolver/vagrant)
+  end
+
+  # Vagrant commands
+  %w(halt provision resume reload ssh status suspend).each do |method|
+    class_eval <<-VAGRANT_METHOD
+      desc '#{method}', 'Runs the #{method} vagrant command'
+      def #{method}(*args)
+        run_vagrant_command("#{method} \#{args.join(' ')}")
+      end
+    VAGRANT_METHOD
+  end
+end

data/lib/sumodev/commands/hooks.rb

@@ -67,6 +67,24 @@ class Sumodev::Commands::Hooks < Sumodev::Command
       errors_and_warnings
     end
 
+    def check_for_merge_conflicts(files)
+      methods = [
+        {
+          :human_readable_message => "Checking for merge conflicts",
+          :command => "egrep -no '<<<<<<<' %{file}",
+          :line_handler => lambda { |line|
+            return build_error_or_warning(
+              'warning',
+              line.scan(/([0-9]*):/)[0][0],
+              "Merge conflict found: " + line.scan(/[0-9]*:(.*)/)[0][0]
+            )
+          }
+        }
+      ]
+
+      check_files(files, methods)
+    end
+
     def check_css_files(files)
       methods = [
         {

data/lib/sumodev/commands/project.rb

@@ -1,5 +1,7 @@
 require 'sumodev/command'
 require 'sumodev/config'
+require 'open3'
+require 'securerandom'
 
 class Sumodev::Commands::Project < Sumodev::Command
   namespace :project
@@ -48,6 +50,115 @@ class Sumodev::Commands::Project < Sumodev::Command
     end
   end
 
+  option :project_path, :desc => "the path where the project should be placed"
+  option :bundles, :type => :boolean, :default => true, :desc => "install bundles"
+  option :node_modules, :type => :boolean, :default => true, :desc => "install node-modules"
+  option :bower, :type => :boolean, :default => true, :desc => "install bower packages"
+  option :composer, :type => :boolean, :default => true, :desc => "install composer packages"
+  option :composer_run_scripts, :type => :boolean, :default => true, :desc => "run composer scripts"
+
+  desc 'new fork|framework client project', 'create a new Fork Project'
+  def new(type, client, project)
+    begin
+      if type != "fork"
+        raise "Only fork is implemented"
+      end
+
+      repo = "git@git.sumocoders.be:sumocoders/#{client}-#{project}.git"
+      repo_url = repo.gsub('.be:', '.be/').gsub('git@', 'http://').gsub('.git', '')
+
+      # check if repo exists
+      begin
+        self.run_command_without_output("git ls-remote #{repo}", nil, "--> Check if repo #{repo} exists.")
+      rescue Exception => e
+        raise "Please create a repository named #{client}-#{project} first:\nhttp://git.sumocoders.be/projects/new"
+      end
+
+      tmp_path = File.expand_path(Sumodev::Config.get('SUMO_TEMP_PATH'));
+      sites_path = File.expand_path(Sumodev::Config.get('SUMO_SITES_PATH'))
+
+      if options[:project_path].nil?
+        project_path = File.expand_path("#{sites_path}/#{client}/#{project}")
+      else
+        project_path = File.expand_path(options[:project_path])
+      end
+
+      clone_repo("git://github.com/sumocoders/forkcms.git", "#{tmp_path}/temp_project")
+      run_command_without_output("rm -rf #{tmp_path}/temp_project/.git")
+      initialize_repo("#{tmp_path}/temp_project", repo)
+
+      # ask to set the default branch to staging
+      run_command_without_output("open #{repo_url}/edit")
+      continue?("Gitlab will now open, change the default branch to *staging*")
+
+      move_project("#{tmp_path}/temp_project", project_path)
+      populate_capfile("#{project_path}/Capfile", client, project, repo)
+
+      # install assets
+      install_bundles(project_path) if options[:bundles]
+      install_node_modules(project_path) if options[:node_modules]
+      install_bower_packages(project_path) if options[:bower]
+      install_composer_packages(project_path, options[:composer_run_scripts]) if options[:composer]
+
+      # create database
+      run_command_without_output(
+        [
+          "bundle exec cap staging sumodev:db:create",
+          "bundle exec cap staging sumodev:db:get"
+        ],
+        project_path,
+        "--> Creating database on staging and local"
+      )
+
+      # grab database information
+      output = run_command_without_output("bundle exec cap staging sumodev:db:info 2>&1", project_path)
+      database_information = output.out
+        .gsub("** [out :: dev.sumocoders.be] ", "")
+        .gsub("\n", "")
+
+      database_name = database_information.scan(/database:(.*)user/)[0][0].gsub(/\s+/, '')
+      database_user = database_information.scan(/user:(.*)pass/)[0][0].gsub(/\s+/, '')
+      database_password = database_information.scan(/pass:(.*)command/)[0][0].gsub(/\s+/, '')
+
+      run_command_without_output(
+        "sed -i '' -e 's|site.path_www:.*|site.path_www: /home/sites/#{client}/#{project}|g' #{project_path}/app/config/parameters_install.yml",
+        nil,
+        "--> Configuring parameters_install.yml"
+      )
+      run_command_without_output("rm -rf #{project_path}/app/cache/install")
+
+      # run the installer
+      run_command_without_output("open http://#{project}.#{client}.dev")
+      continue?("The installer will now open.\nYou can use *#{database_name}* as the database_name.")
+
+      install_initial_theme(project_path, database_name)
+
+      # commit our changes
+      run_command_without_output(
+        [
+          "git add Capfile",
+          "git add app/config/parameters_install.yml",
+          "git add package.json",
+          "git add Gemfile.lock",
+          "git add src/Frontend/Themes/Custom",
+          "git commit -m 'Init configuration of the project'",
+          "git push"
+        ],
+        project_path,
+        "--> Commiting the initial configuration of the project"
+      )
+
+      # deploy
+      initial_deploy(project_path, client, project, database_name, database_user, database_password)
+      deploy(project_path, "staging")
+
+      change_location(project_path)
+      say "All done", :green
+    rescue Exception => e
+      say e.message, :red
+    end
+  end
+
   no_commands do
     def get_client(path)
       return get_var(path, "client")
@@ -70,9 +181,27 @@ class Sumodev::Commands::Project < Sumodev::Command
     end
 
     def clone_repo(repo, destination)
-      say "Cloning repo #{repo}", :green
-      system "rm -rf #{destination}"
-      system "git clone -q #{repo} #{destination} > /dev/null"
+      run_command_without_output(
+        "rm -rf #{destination}; git clone #{repo} #{destination}",
+        nil,
+        "--> Cloning repo #{repo}"
+      )
+    end
+
+    def initialize_repo(path, repo)
+      run_command_without_output(
+        [
+          "git init",
+          "git add .",
+          "git commit -n -m 'Initial commit'",
+          "git remote add origin #{repo}",
+          "git push -u origin master",
+          "git checkout -b staging",
+          "git push -u origin staging"
+        ],
+        path,
+        "--> Initialize repo #{repo}"
+      )
     end
 
     def process_capfile(path)
@@ -96,13 +225,27 @@ class Sumodev::Commands::Project < Sumodev::Command
       ]
     end
 
+    def populate_capfile(path, client, project, repo)
+      unless File.file?(path)
+        raise "No Capfile found"
+      end
+
+      say "--> Configuring Capfile", :green
+
+      content = File.read(path)
+        .gsub(/set :client,.*/, "set :client, \"#{client}\"")
+        .gsub(/set :project,.*/, "set :project, \"#{project}\"")
+        .gsub(/set :repository,.*/, "set :repository, \"#{repo}\"")
+
+      File.write(path, content)
+    end
+
     def install_bundles(path)
       unless File.file?("#{path}/Gemfile")
         return
       end
 
-      say "Installing gems", :green
-      system "cd #{path}; bundle install"
+      run_command_without_output("bundle install", path, "--> Installing gems")
     end
 
     def install_node_modules(path)
@@ -110,8 +253,7 @@ class Sumodev::Commands::Project < Sumodev::Command
         return
       end
 
-      say "Installing node modules", :green
-      system "cd #{path}; npm install"
+      run_command_without_output("npm install", path, "--> Installing node modules")
     end
 
     def install_bower_packages(path)
@@ -119,23 +261,36 @@ class Sumodev::Commands::Project < Sumodev::Command
         return
       end
 
-      say "Installing bower packages", :green
-      system "cd #{path}; bower install"
+      run_command_without_output("bower install", path, "--> Installing bower packages")
     end
 
     def install_composer_packages(path, run_scripts)
       unless File.file?("#{path}/composer.json")
-        puts "foo"
         return
       end
 
-      say "Installing dependencies", :green
+      cmd = "composer install"
 
-      if run_scripts
-        system "cd #{path}; composer install"
-      else
-        system "cd #{path}; composer install --no-scripts"
+      if !run_scripts
+        cmd = "#{cmd} --no-scripts"
       end
+
+      run_command_without_output(cmd, path, "--> Installing composer dependencies")
+    end
+
+    def install_initial_theme(path, database)
+      run_command_without_output(
+        [
+          "php tools/install_locale.php -f src/Frontend/Themes/Bootstrap/locale.xml",
+          "cp -r src/Frontend/Themes/Bootstrap src/Frontend/Themes/Custom",
+          "sed -i '' -e 's|.*<name>bootstrap</name>.*|  <name>custom</name>|g' src/Frontend/Themes/Custom/info.xml",
+          "sed -i '' -e 's/set :theme.*/set :theme, \"Custom\"/g' Capfile",
+          "sed -i '' -e 's/.*\"theme\":.*/  \"theme\": \"Custom\",/g' package.json",
+          "mysql #{database} -e \"UPDATE modules_settings SET value='s:6:\\\"Custom\\\"' where module='Core' and name='theme'\""
+        ],
+        path,
+        "--> Creating the initial Custom theme"
+      )
     end
 
     def move_project(source, destination)
@@ -143,9 +298,14 @@ class Sumodev::Commands::Project < Sumodev::Command
         raise "Project folder already exists."
       end
 
-      say "Creating and moving everything into place", :green
-      system "mkdir -p #{destination}; cd #{destination}"
-      system "shopt -s dotglob; mv #{source}/* #{destination}"
+      run_command_without_output(
+        [
+          "mkdir -p #{destination}",
+          "shopt -s dotglob; mv #{source}/* #{destination}"
+        ],
+        nil,
+        "--> Moving everything into place"
+      )
     end
 
     def fetch_data(path, stage)
@@ -165,7 +325,7 @@ class Sumodev::Commands::Project < Sumodev::Command
         return
       end
 
-      content = File.read(version_path)
+      content = File.read("#{path}/VERSION.md")
       min_version = Gem::Version.new('3.6')
       project_version = Gem::Version.new(content)
 
@@ -183,8 +343,43 @@ class Sumodev::Commands::Project < Sumodev::Command
       end
     end
 
+    def initial_deploy(path, client, project, database_name, database_user, database_password)
+      content = File.read("#{path}/app/config/parameters.yml")
+      content = content
+        .gsub(/database.host:.*/, "database.host: 127.0.0.1")
+        .gsub(/database.name:.*/, "database.name: #{database_name}")
+        .gsub(/database.user:.*/, "database.user: #{database_user}")
+        .gsub(/database.password:.*/, "database.password: #{database_password}")
+        .gsub(/site.domain:.*/, "site.domain: #{project}.#{client}.sumocoders.eu")
+      File.write("#{path}/app/config/parameters.dev.yml", content)
+
+      run_command_without_output(
+        [
+          "bundle exec cap deploy:setup",
+          "bundle exec cap deploy",
+          "bundle exec cap sumodev:db:put",
+          "bundle exec cap sumodev:db:lock",
+          "scp app/config/parameters.dev.yml sites@dev.sumocoders.eu:/home/sites/apps/#{client}/#{project}/shared/config/parameters.yml",
+          "rm #{path}/app/config/parameters.dev.yml"
+        ],
+        path,
+        "--> Running initial deploy, aka deploy:setup"
+      )
+    end
+
+    def deploy(path, stage)
+      run_command_without_output(
+        [
+          "grunt build",
+          "bundle exec cap #{stage} deploy"
+        ],
+        path,
+        "--> Deploying to #{stage}"
+      )
+    end
+
     def change_location(destination)
-      say "Your project is located in:\n#{destination}"
+      say colorize("Your project is located in: *#{destination}*"), :green
     end
   end
 end

data/lib/sumodev/version.rb

@@ -1,3 +1,3 @@
 module Sumodev
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumodev
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Jan De Poorter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport