diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-07-07 01:15:17 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-07-07 01:15:17 -0400 | 
| commit | 4080aa456e59c8ac41892e009c6d356d13cf3f63 (patch) | |
| tree | 4b34f098244844f4d49b730c9b39323fe98bbcbf /bin | |
| parent | v5 v6: version & changelog (& rakefile) (git, ref log instead of shortlog) (diff) | |
bin/sisu, some cosmetic long line breaking
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sisu | 31 | 
1 files changed, 21 insertions, 10 deletions
| @@ -28,7 +28,8 @@ class Orient      and File.dirname(processing.file_full_path) != Config::CONFIG['bindir']        :full_path_to_sisu_bin_in_sisu_dir_tree      elsif processing.file_full_path =~/\/gems\// \ -    and  processing.file_full_path =~/\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\// +    and processing.file_full_path \ +    =~ /\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//        :gem_install      else        :system_install @@ -113,11 +114,14 @@ class Orient    end    def paths_set      if sisu_run_from == :system_install \ -    and processing.called_as =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ +    and processing.called_as \ +    =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/        :set_path_system      elsif sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \ -    and processing.called_as !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ -    && File.expand_path(processing.called_as) =~/bin\/sisu[#{version.stable}#{version.unstable}]?$/ \ +    and processing.called_as \ +    !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ +    && File.expand_path(processing.called_as) \ +    =~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \      && FileTest.file?(processing.called_as)        :set_dir_tree_full_path      elsif sisu_run_from==:gem_install @@ -130,7 +134,8 @@ class Orient      when :set_path_system        Config::CONFIG['datadir'] + '/sisu'      when :set_dir_tree_full_path -      File.expand_path(processing.called_as).sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'') +      File.expand_path(processing.called_as). +        sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'')      when :set_gem_path        Gem::Specification.find_by_name("sisu").gem_dir      else nil @@ -141,15 +146,18 @@ class Orient      when :set_path_system        Config::CONFIG['datadir'] + '/sisu'      when :set_dir_tree_full_path -      File.expand_path(processing.called_as).sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu') +      File.expand_path(processing.called_as). +        sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu')      when :set_gem_path        Gem::Specification.find_by_name("sisu").gem_dir + '/data/sisu'      else nil      end    end    def sisu_path_specified_lib -    if (processing.called_as !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) -      File.expand_path(processing.called_as).sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib') +    if (processing.called_as \ +    !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) +      File.expand_path(processing.called_as). +        sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib')      else nil      end    end @@ -183,7 +191,9 @@ class Orient              command_line_modifiers << x            elsif x =~/\.ss[tm]/              if x =~/\// -              markup_path,markup_file =(/(\S+\/)((?:#{language_list.regex})?[^\/]+)/).match(x)[1,2] +              markup_path,markup_file = +                (/(\S+\/)((?:#{language_list.regex})?[^\/]+)/). +                match(x)[1,2]                if not processing_files[markup_path]                  processing_files[markup_path]=[]                end @@ -237,7 +247,8 @@ class Orient        end      else        $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'') -      $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'') +      $sisu_document_markup_directory_base_fixed_path= +        Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'')        SiSU::HubMaster.new(processing.argv)      end    end | 
