grassgis 0.4.1 → 0.4.2

data/Rakefile

@@ -1,22 +1,22 @@
-require "bundler/gem_tasks"
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = GrassGis::VERSION
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "GrassGis #{version}"
-  rdoc.main = "README.md"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.markup = 'markdown' if rdoc.respond_to?(:markup)
-end
-
-task :default => :test
+require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = GrassGis::VERSION
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "GrassGis #{version}"
+  rdoc.main = "README.md"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.markup = 'markdown' if rdoc.respond_to?(:markup)
+end
+
+task :default => :test

data/Vagrantfile

@@ -1,18 +1,18 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty32"
-
-  config.vm.provision "shell", inline: <<-SHELL
-    sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
-    sudo add-apt-repository -y ppa:grass/grass-stable
-    sudo apt-get update -y
-    sudo apt-get install -y grass7
-    sudo apt-get install -y grass7-dev
-    sudo apt-get install -y build-essential
-    sudo apt-get install -y ruby-dev
-    sudo apt-get install -y libsqlite3-dev
-    sudo gem install bundler
-  SHELL
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty32"
+
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+    sudo add-apt-repository -y ppa:grass/grass-stable
+    sudo apt-get update -y
+    sudo apt-get install -y grass7
+    sudo apt-get install -y grass7-dev
+    sudo apt-get install -y build-essential
+    sudo apt-get install -y ruby-dev
+    sudo apt-get install -y libsqlite3-dev
+    sudo gem install bundler
+  SHELL
+end

data/grassgis.gemspec

@@ -1,28 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'grassgis/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "grassgis"
-  spec.version       = GrassGis::VERSION
-  spec.authors       = ["Javier Goizueta"]
-  spec.email         = ["jgoizueta@gmail.com"]
-  spec.summary       = %q{Support for scripting GRASS GIS in Ruby}
-  spec.description   = %q{Support for scripting GRASS GIS in Ruby.}
-  spec.homepage      = "https://github.com/jgoizueta/grassgis"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "sys_cmd", "~> 1.1"
-
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5.4"
-
-  spec.required_ruby_version = '>= 1.9.3'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'grassgis/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "grassgis"
+  spec.version       = GrassGis::VERSION
+  spec.authors       = ["Javier Goizueta"]
+  spec.email         = ["jgoizueta@gmail.com"]
+  spec.summary       = %q{Support for scripting GRASS GIS in Ruby}
+  spec.description   = %q{Support for scripting GRASS GIS in Ruby.}
+  spec.homepage      = "https://github.com/jgoizueta/grassgis"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "sys_cmd", "~> 1.1"
+
+  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest", "~> 5.4"
+
+  spec.required_ruby_version = '>= 1.9.3'
+end

data/lib/grassgis/context.rb

@@ -23,7 +23,7 @@ module GrassGis
       config[:png_auto_write] = true unless config.key?(:png_auto_write)
       config[:gnuplot] ||= 'gnuplot -persist'
       config[:gui] ||= 'wxpython'
-      config[:pyhton] ||= 'python'
+      config[:python] ||= 'python'
 
       config[:errors] ||= :raise
       config[:echo] = :commands unless config.key?(:echo)

data/lib/grassgis/error.rb

@@ -1,4 +1,4 @@
-module GrassGis
-  class Error < StandardError
-  end
-end
+module GrassGis
+  class Error < StandardError
+  end
+end

data/lib/grassgis/location.rb

@@ -1,53 +1,53 @@
-module GrassGis
-  class Location
-    def initialize(context)
-      @context = context
-      @configuration = @context.configuration
-      @gisdbase = @configuration[:gisdbase]
-      @location = @configuration[:location]
-      @path = File.join(@gisdbase, @location)
-    end
-
-    attr_reader :path
-
-    def to_s
-      @location
-    end
-
-    def exists?
-      File.directory?(@path)
-    end
-
-    def create!(options = {})
-      raise Error, "Location #{@location} already exists" if exists?
-      raise Error, "A file with the same name #{@location} exists" if File.exists?(@path)
-      raise Error, "GRASSDBASE doesn't exist" unless File.directory?(@gisdbase)
-      epsg = options[:epsg]
-      limits = options[:limits]
-      desc = options[:desc]
-      raise Error, "An EPSG code is needed to define a new loaction" unless epsg
-      @context.g.proj '-t', epsg: epsg, location: @location
-      permanent = permanent_path
-      if desc
-        desc_file = File.join(permanent, 'MYNAME')
-        File.write desc_file, desc
-      end
-      if limits
-        w, s, e, n = limits
-        res = options[:res]
-        # @context.g.mapset mapset: 'PERMANENT', location: @location
-        @context.change_mapset 'PERMANENT'
-        @context.g.region w: w, s: s, e: e, n: n, res: res
-        FileUtils.cp File.join(permanent, 'WIND'), File.join(permanent, 'DEFAULT_WIND')
-      end
-    end
-
-    def mapset_path(mapset)
-      File.join(@path, mapset)
-    end
-
-    def permanent_path
-      mapset_path('PERMANENT')
-    end
-  end
-end
+module GrassGis
+  class Location
+    def initialize(context)
+      @context = context
+      @configuration = @context.configuration
+      @gisdbase = @configuration[:gisdbase]
+      @location = @configuration[:location]
+      @path = File.join(@gisdbase, @location)
+    end
+
+    attr_reader :path
+
+    def to_s
+      @location
+    end
+
+    def exists?
+      File.directory?(@path)
+    end
+
+    def create!(options = {})
+      raise Error, "Location #{@location} already exists" if exists?
+      raise Error, "A file with the same name #{@location} exists" if File.exists?(@path)
+      raise Error, "GRASSDBASE doesn't exist" unless File.directory?(@gisdbase)
+      epsg = options[:epsg]
+      limits = options[:limits]
+      desc = options[:desc]
+      raise Error, "An EPSG code is needed to define a new loaction" unless epsg
+      @context.g.proj '-t', epsg: epsg, location: @location
+      permanent = permanent_path
+      if desc
+        desc_file = File.join(permanent, 'MYNAME')
+        File.write desc_file, desc
+      end
+      if limits
+        w, s, e, n = limits
+        res = options[:res]
+        # @context.g.mapset mapset: 'PERMANENT', location: @location
+        @context.change_mapset 'PERMANENT'
+        @context.g.region w: w, s: s, e: e, n: n, res: res
+        FileUtils.cp File.join(permanent, 'WIND'), File.join(permanent, 'DEFAULT_WIND')
+      end
+    end
+
+    def mapset_path(mapset)
+      File.join(@path, mapset)
+    end
+
+    def permanent_path
+      mapset_path('PERMANENT')
+    end
+  end
+end

data/lib/grassgis/mapset.rb

@@ -1,31 +1,31 @@
-module GrassGis
-  class Mapset
-    def initialize(context)
-      @context = context
-      @configuration = @context.configuration
-      @location = Location.new(@context)
-      @mapset = @configuration[:mapset]
-      @path = File.join(@location.path, @mapset)
-    end
-
-    attr_reader :path
-
-    def to_s
-      @mapset
-    end
-
-    def exists?
-      File.directory?(@path)
-    end
-
-    def create!(options = {})
-      raise Error, "Mapset #{@mapset} already exists" if exists?
-      raise Error, "A file with the same name #{@mapset} exists" if File.exists?(@path)
-      raise Error, "Location doesn't exist" unless @location.exists?
-      # @context.g.mapet '-c', mapset: @mapset, location: @location.to_s, dbase: @configuration[:gisdbase]
-      FileUtils.mkdir_p @path
-      permanent = @location.permanent_path
-      FileUtils.cp File.join(permanent, 'DEFAULT_WIND'), File.join(@path, 'WIND')
-    end
-  end
-end
+module GrassGis
+  class Mapset
+    def initialize(context)
+      @context = context
+      @configuration = @context.configuration
+      @location = Location.new(@context)
+      @mapset = @configuration[:mapset]
+      @path = File.join(@location.path, @mapset)
+    end
+
+    attr_reader :path
+
+    def to_s
+      @mapset
+    end
+
+    def exists?
+      File.directory?(@path)
+    end
+
+    def create!(options = {})
+      raise Error, "Mapset #{@mapset} already exists" if exists?
+      raise Error, "A file with the same name #{@mapset} exists" if File.exists?(@path)
+      raise Error, "Location doesn't exist" unless @location.exists?
+      # @context.g.mapet '-c', mapset: @mapset, location: @location.to_s, dbase: @configuration[:gisdbase]
+      FileUtils.mkdir_p @path
+      permanent = @location.permanent_path
+      FileUtils.cp File.join(permanent, 'DEFAULT_WIND'), File.join(@path, 'WIND')
+    end
+  end
+end

data/lib/grassgis/module.rb

@@ -1,73 +1,73 @@
-module GrassGis
-
-  # Generate and execute GRASS commands
-  #
-  #     r = GrassGis::Module.new('r')
-  #     r.resamp.stats '-n', input: "map1@mapset1", output: "map2"
-  #
-  # To execute a command without arguments, +run+ must be invoked explicitly:
-  #
-  #     g = GrassGis::Module.new('g')
-  #     g.region.run
-  #
-  class Module
-    def initialize(id, options = {})
-      @id = id.to_s
-      @parent = options[:parent]
-      @context = options[:context]
-    end
-
-    def name
-      if @parent
-        "#{@parent.name}.#{@id}"
-      else
-        @id
-      end
-    end
-
-    # Executes the command (with given arguments)
-    # returns a SysCmd object (with status, status_value, output, error_output methods)
-    def run(*args)
-      stdin = nil
-      cmd = SysCmd.command name do
-        args.each do |arg|
-          case arg
-          when Hash
-            arg.each do |key, value|
-              next if value.nil?
-              case value
-              when Array
-                value = value*","
-              when String
-                if value.include?("\n")
-                  raise "Cannot pass multiple options through STDIN" if stdin
-                  stdin = Support.unindent(value)
-                  value = "-"
-                  input stdin
-                end
-              end
-              option key.to_s, equal_value: value
-            end
-          else
-            option arg
-          end
-        end
-      end
-      if @context
-        @context.execute cmd
-      end
-      cmd
-    end
-
-    def method_missing(method, *args)
-      m = Module.new(method, parent: self, context: @context)
-      if args.size > 0
-        m.run *args
-      else
-        m
-      end
-    end
-
-  end
-
-end
+module GrassGis
+
+  # Generate and execute GRASS commands
+  #
+  #     r = GrassGis::Module.new('r')
+  #     r.resamp.stats '-n', input: "map1@mapset1", output: "map2"
+  #
+  # To execute a command without arguments, +run+ must be invoked explicitly:
+  #
+  #     g = GrassGis::Module.new('g')
+  #     g.region.run
+  #
+  class Module
+    def initialize(id, options = {})
+      @id = id.to_s
+      @parent = options[:parent]
+      @context = options[:context]
+    end
+
+    def name
+      if @parent
+        "#{@parent.name}.#{@id}"
+      else
+        @id
+      end
+    end
+
+    # Executes the command (with given arguments)
+    # returns a SysCmd object (with status, status_value, output, error_output methods)
+    def run(*args)
+      stdin = nil
+      cmd = SysCmd.command name do
+        args.each do |arg|
+          case arg
+          when Hash
+            arg.each do |key, value|
+              next if value.nil?
+              case value
+              when Array
+                value = value*","
+              when String
+                if value.include?("\n")
+                  raise "Cannot pass multiple options through STDIN" if stdin
+                  stdin = Support.unindent(value)
+                  value = "-"
+                  input stdin
+                end
+              end
+              option key.to_s, equal_value: value
+            end
+          else
+            option arg
+          end
+        end
+      end
+      if @context
+        @context.execute cmd
+      end
+      cmd
+    end
+
+    def method_missing(method, *args)
+      m = Module.new(method, parent: self, context: @context)
+      if args.size > 0
+        m.run *args
+      else
+        m
+      end
+    end
+
+  end
+
+end

data/lib/grassgis/support.rb

@@ -1,26 +1,26 @@
-module GrassGis
-  module Support
-    module_function
-
-    def unindent(text, indent = nil)
-      text = text.gsub(/\t/, ' '*8)
-      mx = text.scan(/^ *[^\n\r]/)
-               .flatten
-               .map{ |s| s[-1,1]==' ' ? nil : (s.size-1) }
-               .compact.min
-      if mx && mx>0
-        text.gsub!(/^ {1,#{mx}}/, "")
-      end
-      lines = text.split(/\r?\n/)
-      if lines.first.strip.empty? || lines.last.strip.empty?
-        lines.shift while lines.first.strip.empty?
-        lines.pop while lines.last.strip.empty?
-      end
-      if indent
-        indent = ' ' * indent if indent.kind_of?(Numeric)
-        lines = lines.map { |line| "#{indent}#{line}" }
-      end
-      lines.join("\n")
-    end
-  end
-end
+module GrassGis
+  module Support
+    module_function
+
+    def unindent(text, indent = nil)
+      text = text.gsub(/\t/, ' '*8)
+      mx = text.scan(/^ *[^\n\r]/)
+               .flatten
+               .map{ |s| s[-1,1]==' ' ? nil : (s.size-1) }
+               .compact.min
+      if mx && mx>0
+        text.gsub!(/^ {1,#{mx}}/, "")
+      end
+      lines = text.split(/\r?\n/)
+      if lines.first.strip.empty? || lines.last.strip.empty?
+        lines.shift while lines.first.strip.empty?
+        lines.pop while lines.last.strip.empty?
+      end
+      if indent
+        indent = ' ' * indent if indent.kind_of?(Numeric)
+        lines = lines.map { |line| "#{indent}#{line}" }
+      end
+      lines.join("\n")
+    end
+  end
+end

data/lib/grassgis/version.rb

@@ -1,3 +1,3 @@
-module GrassGis
-  VERSION = "0.4.1"
-end
+module GrassGis
+  VERSION = "0.4.2"
+end

data/lib/grassgis.rb

@@ -1,8 +1,8 @@
-require 'sys_cmd'
-require 'grassgis/version'
-require 'grassgis/error'
-require 'grassgis/support'
-require 'grassgis/module'
-require 'grassgis/location'
-require 'grassgis/mapset'
-require 'grassgis/context'
+require 'sys_cmd'
+require 'grassgis/version'
+require 'grassgis/error'
+require 'grassgis/support'
+require 'grassgis/module'
+require 'grassgis/location'
+require 'grassgis/mapset'
+require 'grassgis/context'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grassgis
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys_cmd
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Support for scripting GRASS GIS in Ruby