watir_install 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b1d7616e709714e853171cf89e54227aa6eb3a1
-  data.tar.gz: '038db3182ad033c07b53655482e1e2f7a11db91e'
+  metadata.gz: 89ce76e60591791aba7f5eda50f9f4c9ffde6b6b
+  data.tar.gz: e6168652410aa1d91c537775f67036a14e2e4d57
 SHA512:
-  metadata.gz: d13c3fd8dc25d3f9ca9c3a086e92b5f74065a27271801dfa23e131e4eaacbbfce85a7f8bc250176087f6c89f6abb7ee03adb9f66c2b918c0a573887e3f373b8b
-  data.tar.gz: ee596feba54b805885cc0ac154475a583de453a607f9789562fe025ed53b4c673abb22d8714c435f23ae1ed1a520ea9002894abcdd2f2e4ee4bf6e21991002ea
+  metadata.gz: f980387a3ca832725133889489cd37327d121cc1c14d88621f1852308d419169951c64c298bd3268037d2481eece2598b6a6909105934dd3a54d02f059150e55
+  data.tar.gz: 2a2d0394cd58940f651a423e5da510b17f952e38c4a034c3c0c5472e0b70d140e22b1019d147d237b1cb514ae6ef2a1f660547007622c2148f0a28a1092fa5a2

data/CHANGES.md

@@ -1,3 +1,10 @@
+### 0.3.1 (2017-05-25)
+
+* Fix name spacing
+* Fix Sauce issues
+* Add base_url support to new command
+* Add git tracking for generated files
+
 ### 0.3.0 (2017-05-23)
 
 * Remove sample code from new command

data/README.md

@@ -60,6 +60,9 @@ the recommended default configurations to easily create and maintain your test s
 
     $ watir generate scaffold ObjectName el1 el2 el3 el4 --url http://example.com/object
 
+## See Example Project
+
+    $ watir example
 
 ## Contributing
 

data/lib/watir_install/cli.rb

@@ -7,9 +7,10 @@ module WatirInstall
 
     desc "new <project_name>", "Create a new test project"
     method_option :no_git, type: :boolean, desc: "Do not initialize project with git"
+    method_option :base_url, type: :string, desc: "Set a root url for the project"
 
     def new(name)
-      WatirInstall::Generators::New.start([name, options[:no_git]])
+      WatirInstall::Generators::New.start([name, options[:base_url], options[:no_git]])
     end
 
     desc "generate <generated_type>", "Generate a new object"
@@ -45,7 +46,7 @@ module WatirInstall
 
     desc "generate_scaffold <Class>", "Generate collection of data, pages and tests"
 
-    def generate_scaffold(klass, url, form, *args)
+    def generate_scaffold(klass, url, _form, *args)
       WatirInstall::Generators::Test.start([klass, 'true'])
 
       WatirInstall::Generators::Data.start([klass, *args])

data/lib/watir_install/generators/data.rb

@@ -21,12 +21,18 @@ module WatirInstall
         "#{File.dirname(__FILE__)}/data"
       end
 
+      def git
+        @git = Git.open('./') if Dir.entries('./').include?('.git')
+      end
+
       def name
         Dir.pwd[/[^\/]*$/]
       end
 
       def data_files
-        template "spec/support/data/data.rb.tt", "#{Dir.pwd}/spec/support/data/#{klass.downcase}.rb"
+        file = "#{Dir.pwd}/spec/support/data/#{klass.downcase}.rb"
+        template "spec/support/data/data.rb.tt", file
+        @git.add(file) if @git
       end
 
     end

data/lib/watir_install/generators/new.rb

@@ -8,7 +8,8 @@ module WatirInstall
       include Thor::Actions
 
       argument :name, type: :string, desc: 'The name of the test project'
-      argument :no_git, type: :string, default: 'false', desc: 'Do not initialize project with git'
+      argument :base_url, type: :string, required: false, default: '', desc: 'Set a root url for the project'
+      argument :no_git, type: :string, required: false, default: 'false', desc: 'Do not initialize project with git'
 
       def self.source_root
         "#{File.dirname(__FILE__)}/new"
@@ -57,6 +58,7 @@ module WatirInstall
 
       def support_files
         template "spec/support/sauce_helpers.rb.tt", "#{name}/spec/support/sauce_helpers.rb"
+        template "spec/support/site.rb.tt", "#{name}/spec/support/site.rb"
       end
 
       def bundle

data/lib/watir_install/generators/new/spec/spec_helper.rb.tt

@@ -1,28 +1,35 @@
+ENV['USE_SAUCE'] ||= 'false'
+<% unless base_url.empty? -%>
+ENV['BASE_URL'] ||= "<%= base_url %>"
+<% end -%>
+
 require "watir_drops"
 require "watir_model"
 require "require_all"
 require_rel "support/data"
 require_rel "support/pages"
-include <%= name.split('_').map(&:capitalize).join %>
+require_rel "support/site"
+require_rel 'support/sauce_helpers' if ENV['USE_SAUCE'] == 'true'
 
-if ENV['USE_SAUCE'] == 'true'
-  require_rel 'support/sauce_helpers'
-end
+include <%= name.split('_').map(&:capitalize).join %>
+include Page
 
 RSpec.configure do |config|
   config.include SauceHelpers if ENV['USE_SAUCE'] == 'true'
 
-  config.before(:each) do
+  config.before(:each) do |test|
     @browser = if ENV['USE_SAUCE'] == 'true'
                  initialize_driver(test.full_description)
                else
                  Watir::Browser.new
                end
 
-    WatirDrops::PageObject.browser = @browser
+    Base.browser = @browser
+    Site.base_url = ENV['BASE_URL']
   end
 
   config.after(:each) do
+    submit_results(@browser.wd.session_id, !test.exception) if ENV['USE_SAUCE'] == 'true'
     @browser.quit
   end
 end

data/lib/watir_install/generators/new/spec/support/pages/base.rb.tt

@@ -1,5 +1,7 @@
 module <%= name.split('_').map(&:capitalize).join %>
-  class Base < WatirDrops::PageObject
+  module Page
+    class Base < WatirDrops::PageObject
 
+    end
   end
 end

data/lib/watir_install/generators/new/spec/support/site.rb.tt

@@ -0,0 +1,15 @@
+module <%= name.split('_').map(&:capitalize).join %>
+  class Site
+
+    class << self
+      def base_url=(base_url)
+        @@base_url = base_url
+      end
+
+      def base_url
+        @@base_url
+      end
+    end
+
+  end
+end

data/lib/watir_install/generators/page.rb

@@ -16,12 +16,18 @@ module WatirInstall
         "#{File.dirname(__FILE__)}/pages"
       end
 
+      def git
+        @git = Git.open('./') if Dir.entries('./').include?('.git')
+      end
+
       def name
         Dir.pwd[/[^\/]*$/]
       end
 
-      def data_files
-        template "spec/support/pages/page.rb.tt", "#{Dir.pwd}/spec/support/pages/#{klass.downcase.gsub('::', '/')}.rb"
+      def page_files
+        file = "#{Dir.pwd}/spec/support/pages/#{klass.downcase.gsub('::', '/')}.rb"
+        template "spec/support/pages/page.rb.tt", file
+        @git.add(file) if @git
       end
 
     end

data/lib/watir_install/generators/pages/spec/support/pages/page.rb.tt

@@ -1,22 +1,24 @@
-module <%= name.split('_').map(&:capitalize).join -%>
-<% if klass.include?(':') -%>
-::<%= klass[/^[^:]*/] -%>
-<% end %>
-  class <%= klass[/[^:]*$/] %> < <%= name.split('_').map(&:capitalize).join %>::Base
-
-    <% if url.empty? -%>
-# Define url represented by page object if appropriate
+module <%= name.split('_').map(&:capitalize).join %>
+  class <%= klass.gsub('::', '') %> < Page::Base
 
+<% if url.empty? -%>
+    # Define url represented by page object if appropriate
     # page_url {  }
 <% else -%>
-page_url { "<%= url %>" }
-<% end %>
+<% if url =~ %r{^(about|data|https?):}i -%>
+    page_url { "<%= url %>" }
+<% else -%>
+    page_url { "#{Site.base_url}<%= url %>" }
+<% end -%>
+<% end -%>
+
 
 <% if elements.empty? -%>
     # Define elements representing contents of page
 <% end -%>
     # Specify full Watir locator inside block
     # element(:foo) { browser.div(id: 'foo') }
+
 <% elements.each do |element| -%>
     element(:<%= element %>) {  }
 <% end -%>
@@ -24,7 +26,7 @@ page_url { "<%= url %>" }
     element(:submit) { browser.button(visible: true) }
 
     def submit_form(<%= form.downcase %> = nil)
-      <%= form.downcase %> ||= <%= name.split('_').map(&:capitalize).join %>::Data::<%= form %>.new
+      <%= form.downcase %> ||= Data::<%= form %>.new
       fill_form(<%= form.downcase %>)
       submit.click
       <%= form.downcase %>

data/lib/watir_install/generators/test.rb

@@ -15,16 +15,19 @@ module WatirInstall
         "#{File.dirname(__FILE__)}/tests"
       end
 
+      def git
+        @git = Git.open('./') if Dir.entries('./').include?('.git')
+      end
+
       def name
         Dir.pwd[/[^\/]*$/]
       end
 
       def data_files
-        if form == 'true'
-          template "spec/crud.rb.tt", "#{Dir.pwd}/spec/#{klass.downcase}_spec.rb"
-        else
-          template "spec/spec.rb.tt", "#{Dir.pwd}/spec/#{klass.downcase}_spec.rb"
-        end
+        file = "#{Dir.pwd}/spec/#{klass.downcase}_spec.rb"
+        erb = form == 'true' ? "crud" : "spec"
+        template "spec/#{erb}.rb.tt", file
+        @git.add(file) if @git
       end
 
     end

data/lib/watir_install/generators/tests/spec/crud.rb.tt

@@ -1,26 +1,28 @@
 require 'spec_helper'
 
-describe <%= name.split('_').map(&:capitalize).join %> do
-  let(:<%= klass.downcase %>) { <%= name.split('_').map(&:capitalize).join %>::Data::<%= klass %>.new }
+module <%= name.split('_').map(&:capitalize).join %>
+  describe <%= name.split('_').map(&:capitalize).join %> do
+    let(:<%= klass.downcase %>) { Data::<%= klass %>.new }
 
-  it 'creates' do
+    it 'creates' do
 
-  end
+    end
 
-  it 'shows' do
+    it 'shows' do
 
-  end
+    end
 
-  it 'lists' do
+    it 'lists' do
 
-  end
+    end
 
-  it 'edits' do
+    it 'edits' do
 
-  end
+    end
 
-  it 'deletes' do
+    it 'deletes' do
 
-  end
+    end
 
-end
+  end
+end

data/lib/watir_install/generators/tests/spec/spec.rb.tt

@@ -1,17 +1,19 @@
 require 'spec_helper'
 
-describe <%= name.split('_').map(&:capitalize).join %>::Data::<%= klass %> do
+module <%= name.split('_').map(&:capitalize).join %>
+  describe Data::<%= klass %> do
 
-  let(:<%= klass.downcase %>) { <%= name.split('_').map(&:capitalize).join %>::Data::<%= klass %>.new }
+    let(:<%= klass.downcase %>) { Data::<%= klass %>.new }
 
 <% if specs.empty? -%>
-  # Add RSpec `it` statements
+    # Add RSpec `it` statements
 <% else -%>
 <% specs.each do |spec| %>
-  it '<%= spec -%>' do
+    it '<%= spec -%>' do
 
-  end
+    end
 <% end -%>
 <% end -%>
 
+  end
 end

data/watir_install.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watir_install"
-  spec.version       = "0.3.0"
+  spec.version       = "0.3.1"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_install
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -177,6 +177,7 @@ files:
 - lib/watir_install/generators/new/spec/support/data/base.rb.tt
 - lib/watir_install/generators/new/spec/support/pages/base.rb.tt
 - lib/watir_install/generators/new/spec/support/sauce_helpers.rb.tt
+- lib/watir_install/generators/new/spec/support/site.rb.tt
 - lib/watir_install/generators/new/travis.rb.tt
 - lib/watir_install/generators/page.rb
 - lib/watir_install/generators/pages/spec/support/pages/page.rb.tt